finish_turn() cannot throw end play exceptions, remove handlers

wesnoth · Jun 8, 2014 · 570e0a4 · 570e0a4
1 parent cb9a84b
commit 570e0a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/play_controller.hpp b/src/play_controller.hpp
@@ -201,7 +201,7 @@ class play_controller : public controller_base, public events::observer, public
 	void init_side(bool is_replay = false);
 	void place_sides_in_preferred_locations();
 	virtual void finish_side_turn();
-	void finish_turn();
+	void finish_turn(); //this should not throw an end turn or end level exception
 	bool enemies_visible() const;
 
 	void enter_textbox();

diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp
@@ -680,7 +680,7 @@ possible_end_play_signal playsingle_controller::play_turn()
 	if(player_number_ > static_cast<int>(gameboard_.teams_.size()))
 		player_number_ = gameboard_.teams_.size();
 
-	HANDLE_END_PLAY_SIGNAL ( finish_turn() );
+	finish_turn();
 
 	// Time has run out
 	PROPOGATE_END_PLAY_SIGNAL ( check_time_over() );