fix strict compilation (fixes up HEAD^)

wesnoth · Dec 22, 2014 · 3c69e77 · 3c69e77
1 parent 5732ed5
commit 3c69e77
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/menu_events.cpp b/src/menu_events.cpp
@@ -3323,7 +3323,6 @@ void menu_handler::user_command()
 void menu_handler::request_control_change ( int side_num, const std::string& player )
 {
 	std::string side = str_cast(side_num);
-	int current_side = resources::controller->current_side();
 	if (teams_[side_num - 1].is_local_human() && player == preferences::login()) {
 		//this is already our side.
 		return;

diff --git a/src/team.cpp b/src/team.cpp
@@ -96,8 +96,8 @@ team::team_info::team_info() :
 	objectives(),
 	objectives_changed(false),
 	controller(),
-	proxy_controller(team::PROXY_HUMAN),
 	defeat_condition(team::NO_LEADER),
+	proxy_controller(team::PROXY_HUMAN),
 	share_maps(false),
 	share_view(false),
 	disallow_observers(false),