From cf77d4398b1f7ed51bea77de28d48d363f614b2b Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Sat, 31 Oct 2009 16:49:23 +0000
Subject: [PATCH] Reorder class variable initialization in order to shut up gcc
 warnings.

---
 desmume/src/MMU.h       | 13 +++++++------
 desmume/src/NDSSystem.h | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/desmume/src/MMU.h b/desmume/src/MMU.h
index 6fcd66ea1..a8aa6d6bb 100644
--- a/desmume/src/MMU.h
+++ b/desmume/src/MMU.h
@@ -171,19 +171,20 @@ public:
 	void tryTrigger(EDMAMode mode);
 
 	DmaController() :
-		enable(0), irq(0), bitWidth(EDMABitWidth_16), repeatMode(0), _startmode(0), 
+		enable(0), irq(0), repeatMode(0), _startmode(0),
+		wordcount(0), startmode(EDMAMode_Immediate),
+		bitWidth(EDMABitWidth_16),
+		sar(EDMASourceUpdate_Increment), dar(EDMADestinationUpdate_Increment),
 		//if saddr isnt cleared then rings of fate will trigger copy protection
 		//by inspecting dma3 saddr when it boots
 		saddr(0), daddr(0),
-		sar(EDMASourceUpdate_Increment), dar(EDMADestinationUpdate_Increment),
-		wordcount(0), startmode(EDMAMode_Immediate),
-		sad(&saddr),
-		dad(&daddr),
 		check(FALSE),
 		running(FALSE),
 		paused(FALSE),
 		triggered(FALSE),
-		nextEvent(0)
+		nextEvent(0),
+		sad(&saddr),
+		dad(&daddr)
 	{
 		sad.controller = this;
 		dad.controller = this;
diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
index c6621c071..d1f6799e3 100644
--- a/desmume/src/NDSSystem.h
+++ b/desmume/src/NDSSystem.h
@@ -421,19 +421,19 @@ int NDS_WriteBMP_32bppBuffer(int width, int height, const void* buf, const char
 
 extern struct TCommonSettings {
 	TCommonSettings() 
-		: UseExtBIOS(false)
+		: GFX3D_HighResolutionInterpolateColor(true)
+		, GFX3D_EdgeMark(true)
+		, GFX3D_Fog(true)
+		, UseExtBIOS(false)
 		, SWIFromBIOS(false)
 		, UseExtFirmware(false)
 		, BootFromFirmware(false)
 		, DebugConsole(false)
-		, num_cores(1)
-		, spuInterpolationMode(SPUInterpolation_Linear)
 		//, gfx3d_flushMode(0)
-		, manualBackupType(0)
+		, num_cores(1)
 		, micMode(InternalNoise)
-		, GFX3D_HighResolutionInterpolateColor(true)
-		, GFX3D_EdgeMark(true)
-		, GFX3D_Fog(true)
+		, spuInterpolationMode(SPUInterpolation_Linear)
+		, manualBackupType(0)
 	{
 		strcpy(ARM9BIOS, "biosnds9.bin");
 		strcpy(ARM7BIOS, "biosnds7.bin");