From c998728b8b3fce57db16ec99f7383677734f3e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20H=C3=B6ckersten?= <anders@hockersten.se>
Date: Mon, 25 Aug 2014 19:05:22 +0200
Subject: [PATCH] Fix ordering in constructors

---
 ai/predictive_ai.hpp           |  4 ++--
 common.cpp                     |  4 ++--
 game.cpp                       |  2 +-
 game.hpp                       | 23 ++++++++++++-----------
 gfx.cpp                        |  6 +++---
 menu/booleanSwitchBehavior.hpp | 12 ++++++------
 settings.cpp                   | 10 +++++-----
 stats_recorder.hpp             | 10 +++++-----
 8 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/ai/predictive_ai.hpp b/ai/predictive_ai.hpp
index 2ecd8cf..fc32864 100644
--- a/ai/predictive_ai.hpp
+++ b/ai/predictive_ai.hpp
@@ -390,12 +390,12 @@ struct FollowAI : WormAI, AiContext
 	: frame(0)
 	, model(weights, testing)
 	, evaluationBudget(0)
-	, targetAi(targetAiInit)
 	, effectScaler(0)
-	, weights(weights)
+	, targetAi(targetAiInit)
 	, candPlan(candPopSize)
 	, best(0)
 	, testing(testing)
+	, weights(weights)
 #if AI_THREADS
 	, workQueue(2)
 #endif
diff --git a/common.cpp b/common.cpp
index dc73ac8..1de5a7f 100644
--- a/common.cpp
+++ b/common.cpp
@@ -634,9 +634,9 @@ template<typename Writer>
 struct TextWriter
 {
 	TextWriter(Writer& writer)
-	: writer(writer)
-	, first(true)
+	: first(true)
 	, indent(0)
+	, writer(writer)
 	{
 	}
 
diff --git a/game.cpp b/game.cpp
index 9795e43..4ff155b 100644
--- a/game.cpp
+++ b/game.cpp
@@ -26,11 +26,11 @@ Game::Game(
 , soundPlayer(soundPlayer)
 , settings(settingsInit)
 , statsRecorder(new NormalStatsRecorder)
+, level(*common)
 , screenFlash(0)
 , gotChanged(false)
 , lastKilledIdx(-1)
 , paused(true)
-, level(*common)
 , quickSim(false)
 {
 	rand.seed(uint32_t(std::time(0)));
diff --git a/game.hpp b/game.hpp
index 42f80d6..c31b544 100644
--- a/game.hpp
+++ b/game.hpp
@@ -85,25 +85,26 @@ struct Game
 		if (idx < 0) return 0;
 		return worms[idx];
 	}
-	
-	Level level;
-	
+
 	gvl::shared_ptr<Common> common;
-	gvl::shared_ptr<SoundPlayer> soundPlayer;
-	gvl::shared_ptr<Settings> settings;
-	gvl::shared_ptr<StatsRecorder> statsRecorder;
-	int screenFlash;
-	bool gotChanged;
+	gvl::shared_ptr<SoundPlayer> soundPlayer;
+	gvl::shared_ptr<Settings> settings;
+	gvl::shared_ptr<StatsRecorder> statsRecorder;
+
+	Level level;
+
+	int screenFlash;
+	bool gotChanged;
 	int lastKilledIdx;
-	bool paused;
+	bool paused;
 	int cycles;
 	Rand rand;
 
 	Holdazone holdazone;
-	
+
 	std::vector<Viewport*> viewports;
 	std::vector<Worm*> worms;
-	
+
 	typedef ExactObjectList<Bonus, 99> BonusList;
 	typedef ExactObjectList<WObject, 600> WObjectList;
 	typedef ExactObjectList<SObject, 700> SObjectList;
diff --git a/gfx.cpp b/gfx.cpp
index c810231..5aec591 100644
--- a/gfx.cpp
+++ b/gfx.cpp
@@ -289,12 +289,12 @@ Gfx::Gfx()
 , back(0)
 , running(true)
 , fullscreen(false)
+, doubleRes(true)
 , menuCycles(0)
 , windowW(320 * 2)
 , windowH(200 * 2)
 , prevMag(0)
 , keyBufPtr(keyBuf)
-, doubleRes(true)
 {
 	clearKeys();
 }
@@ -807,8 +807,8 @@ struct ProfileLoadBehavior : ItemBehavior
 struct PlayerSettingsBehavior : ItemBehavior
 {
 	PlayerSettingsBehavior(Common& common, int player)
-	: player(player)
-	, common(common)
+	: common(common)
+	, player(player)
 	{
 	}
 	
diff --git a/menu/booleanSwitchBehavior.hpp b/menu/booleanSwitchBehavior.hpp
index a846f62..0605ca3 100644
--- a/menu/booleanSwitchBehavior.hpp
+++ b/menu/booleanSwitchBehavior.hpp
@@ -10,23 +10,23 @@ struct Menu;
 struct BooleanSwitchBehavior : ItemBehavior
 {
 	BooleanSwitchBehavior(Common& common, bool& v)
-	: common(common), v(v)
-	, set([&](bool newV) { v = newV; })
+	: set([&](bool newV) { v = newV; })
+	, common(common), v(v)
 	{
 	}
 
 	BooleanSwitchBehavior(Common& common, bool& v, std::function<void(bool)> set)
-	: common(common), v(v)
-	, set(set)
+	: set(set)
+	, common(common), v(v)
 	{
 	}
 
 	std::function<void(bool)> set;
-	
+
 	bool onLeftRight(Menu& menu, MenuItem& item, int dir);
 	int onEnter(Menu& menu, MenuItem& item);
 	void onUpdate(Menu& menu, MenuItem& item);
-	
+
 	Common& common;
 	bool& v;
 };
diff --git a/settings.cpp b/settings.cpp
index 0259615..c54ca28 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -23,17 +23,17 @@ Extensions::Extensions()
 : recordReplays(true)
 , loadPowerlevelPalette(true)
 , scaleFilter(Settings::SfNearest)
-, bloodParticleMax(700)
+, bloodParticleMax(700)
+, aiFrames(70*2), aiMutations(2)
+, aiTraces(false)
+, aiParallels(3)
 , fullscreenW(640)
 , fullscreenH(480)
-, aiFrames(70*2), aiMutations(2)
 , zoneTimeout(30)
 , selectBotWeapons(true)
-, aiTraces(false)
-, aiParallels(3)
 , allowViewingSpawnPoint(false)
 {
-}
+}
 
 Settings::Settings()
 : maxBonuses(4)
diff --git a/stats_recorder.hpp b/stats_recorder.hpp
index a4dbff7..c9e7489 100644
--- a/stats_recorder.hpp
+++ b/stats_recorder.hpp
@@ -65,14 +65,14 @@ struct WormFrameStats
 struct WormStats
 {
 	WormStats()
-	: damage(0), damageDealt(0)
-	, selfDamage(0), spawnTime(-1)
+	: damage(0), damageDealt(0), selfDamage(0)
 	, damageHm(504 / 2, 350 / 2, 504, 350)
 	, presence(504 / 2, 350 / 2, 504, 350)
-	, lives(0), timer(0), kills(0)
-	, aiProcessTime(0)
 	, weaponChangeGood(0)
 	, weaponChangeBad(0)
+	, spawnTime(-1)
+	, lives(0), timer(0), kills(0)
+	, aiProcessTime(0)
 	{
 		for (int i = 0; i < 40; ++i)
 			weapons[i].index = i;
@@ -116,8 +116,8 @@ struct NormalStatsRecorder : StatsRecorder
 {
 	NormalStatsRecorder()
 	: frame(0), frameStart(0), processTimeTotal(0)
-	, presence(504 / 2, 350 / 2, 504, 350)
 	, gameTime(0)
+	, presence(504 / 2, 350 / 2, 504, 350)
 	{
 		for (int i = 0; i < 2; ++i)
 		{