From 570e0a40d133d3fb6d29a1ea2ea6c47f412bae9b Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Thu, 5 Jun 2014 07:21:16 -0400 Subject: [PATCH] finish_turn() cannot throw end play exceptions, remove handlers --- src/play_controller.hpp | 2 +- src/playsingle_controller.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/play_controller.hpp b/src/play_controller.hpp index 1d5673493847..e359e4db4ada 100644 --- 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 index 78c70c2a24c8..a7807a6722dc 100644 --- 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(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() );