From 02990bafbfc206aacb31d38eaffce39bf450f83a Mon Sep 17 00:00:00 2001
From: gfgtdf <f492343@rmqkr.net>
Date: Wed, 9 Sep 2015 17:44:51 +0200
Subject: [PATCH] fix some compiler warnings

---
 src/game_state.cpp      | 2 +-
 src/game_state.hpp      | 2 +-
 src/play_controller.cpp | 2 +-
 src/play_controller.hpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game_state.cpp b/src/game_state.cpp
index 5603719b593..87d706f7bed 100644
--- a/src/game_state.cpp
+++ b/src/game_state.cpp
@@ -61,7 +61,7 @@ game_state::game_state(const config & level, play_controller & pc, const tdata_c
 {
 	init(pc.ticks(), pc, level);
 }
-game_state::game_state(const config & level, play_controller & pc, const tdata_cache & tdata, game_board& board) :
+game_state::game_state(const config & level, play_controller & pc, game_board& board) :
 	gamedata_(level),
 	board_(board),
 	tod_manager_(level),
diff --git a/src/game_state.hpp b/src/game_state.hpp
index b2cdd88d7d0..649dd33a7a0 100644
--- a/src/game_state.hpp
+++ b/src/game_state.hpp
@@ -65,7 +65,7 @@ public:
 
 	game_state(const config & level, play_controller &, const tdata_cache & tdata);
 	/// The third parameter is an optimisation.
-	game_state(const config & level, play_controller &, const tdata_cache & tdata, game_board& board);
+	game_state(const config & level, play_controller &, game_board& board);
 
 	~game_state();
 
diff --git a/src/play_controller.cpp b/src/play_controller.cpp
index d41312b5397..82e72e76c1f 100644
--- a/src/play_controller.cpp
+++ b/src/play_controller.cpp
@@ -138,6 +138,7 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
 	: controller_base(game_config, video)
 	, observer()
 	, savegame_config()
+	, ticks_(ticks)
 	, tdata_(tdata)
 	, gamestate_()
 	, level_()
@@ -161,7 +162,6 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
 	, skip_replay_(skip_replay)
 	, linger_(false)
 	, init_side_done_now_(false)
-	, ticks_(ticks)
 	, victory_when_enemies_defeated_(level["victory_when_enemies_defeated"].to_bool(true))
 	, remove_from_carryover_on_defeat_(level["remove_from_carryover_on_defeat"].to_bool(true))
 	, end_level_data_()
diff --git a/src/play_controller.hpp b/src/play_controller.hpp
index 467f2bcd2b4..e09b06372c6 100644
--- a/src/play_controller.hpp
+++ b/src/play_controller.hpp
@@ -261,6 +261,7 @@ protected:
 	//gamestate
 	const tdata_cache & tdata_;
 	boost::scoped_ptr<game_state> gamestate_;
+	config level_;
 	saved_game & saved_game_;
 
 	//managers
@@ -318,7 +319,6 @@ private:
 	std::vector<std::string> victory_music_;
 	std::vector<std::string> defeat_music_;
 
-	config level_;
 	hotkey::scope_changer scope_;
 	// used to sync with the mpserver, not persistent in savefiles.
 	int server_request_number_;