replay_next_turn signals rather than throws, in replay_controller

wesnoth · Jun 8, 2014 · 34d294e · 34d294e
1 parent 051b204
commit 34d294e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/hotkey/command_executor.hpp b/src/hotkey/command_executor.hpp
@@ -82,7 +82,7 @@ class command_executor
 	virtual possible_end_play_signal play_replay() { return boost::none; }
 	virtual void reset_replay() {}
 	virtual void stop_replay() {}
-	virtual void replay_next_turn() {}
+	virtual possible_end_play_signal replay_next_turn() { return boost::none; }
 	virtual void replay_next_side() {}
 	virtual void replay_show_everything() {}
 	virtual void replay_show_each() {}

diff --git a/src/replay_controller.cpp b/src/replay_controller.cpp
@@ -365,17 +365,18 @@ void replay_controller::stop_replay(){
 	is_playing_ = false;
 }
 
-void replay_controller::replay_next_turn(){
+possible_end_play_signal replay_controller::replay_next_turn(){
 	is_playing_ = true;
 	replay_ui_playback_should_start();
 
-	play_turn();
+	HANDLE_END_PLAY_SIGNAL( play_turn() );
 
  	if (!skip_replay_ || !is_playing_){
 		gui_->scroll_to_leader(gameboard_.units_, player_number_,game_display::ONSCREEN,false);
 	}
 
 	replay_ui_playback_should_stop();
+	return boost::none;
 }
 
 void replay_controller::replay_next_side(){

diff --git a/src/replay_controller.hpp b/src/replay_controller.hpp
@@ -39,7 +39,7 @@ class replay_controller : public play_controller
 	possible_end_play_signal play_replay();
 	void reset_replay();
 	void stop_replay();
-	void replay_next_turn();
+	possible_end_play_signal replay_next_turn();
 	void replay_next_side();
 	void process_oos(const std::string& msg) const;
 	void replay_show_everything();