upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 12:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

before_human_turn signals rather than throwing

Browse Source
This commit is contained in:
Chris Beck 2014-06-06 18:12:02 -04:00
parent 29ad76c395
commit 5e0f420277
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/playmp_controller.cpp
View File

@ -104,11 +104,11 @@ possible_end_play_signal playmp_controller::play_side()
return playsingle_controller::play_side();
}
void playmp_controller::before_human_turn(){
possible_end_play_signal playmp_controller::before_human_turn(){
LOG_NG << "playmp::before_human_turn...\n";
playsingle_controller::before_human_turn();
PROPOGATE_END_PLAY_SIGNAL( playsingle_controller::before_human_turn() );
turn_data_.send_data();
return boost::none;
}
void playmp_controller::on_not_observer() {

2
src/playmp_controller.hpp
View File

@ -49,7 +49,7 @@ protected:
virtual bool can_execute_command(const hotkey::hotkey_command& command, int index=-1) const;
virtual possible_end_play_signal play_side();
virtual void before_human_turn();
virtual possible_end_play_signal before_human_turn();
virtual possible_end_play_signal play_human_turn();
virtual void after_human_turn();
virtual void finish_side_turn();

30
src/playsingle_controller.cpp
View File

@ -729,16 +729,11 @@ possible_end_play_signal playsingle_controller::play_side()
if (side_units(player_number_) != 0
|| (resources::units->size() == 0 && player_number_ == 1))
{
possible_end_play_signal signal;
try {
before_human_turn(); //This line throws! the ai manager "raise" line throws exception from here: https://github.com/wesnoth/wesnoth/blob/ac96a2b91b3276e20b682210617cf87d1e0d366a/src/playsingle_controller.cpp#L954
signal = play_human_turn();
} catch (end_level_exception & e) {
signal = e.to_struct();
} catch (end_turn_exception & e) {
signal = e.to_struct();
}
possible_end_play_signal signal = before_human_turn();
if (!signal) {
signal = play_human_turn();
}
if (signal) {
switch (boost::apply_visitor(get_signal_type(), *signal)) {
@ -791,15 +786,11 @@ possible_end_play_signal playsingle_controller::play_side()
end_turn_enable(false);
do_idle_notification();
possible_end_play_signal signal;
try{
before_human_turn(); //This line throws! the ai manager "raise" line throws exception from here: https://github.com/wesnoth/wesnoth/blob/ac96a2b91b3276e20b682210617cf87d1e0d366a/src/playsingle_controller.cpp#L954
possible_end_play_signal signal = before_human_turn();
if (!signal) {
signal = play_idle_loop();
} catch(end_turn_exception& end_turn) {
signal = end_turn.to_struct();
} catch(end_level_exception& e) {
signal = e.to_struct();
}
}
if (signal) {
switch (boost::apply_visitor(get_signal_type(), *signal)) {
@ -832,13 +823,13 @@ possible_end_play_signal playsingle_controller::play_side()
return boost::none;
}
void playsingle_controller::before_human_turn()
possible_end_play_signal playsingle_controller::before_human_turn()
{
log_scope("player turn");
browse_ = false;
linger_ = false;
ai::manager::raise_turn_started();
HANDLE_END_PLAY_SIGNAL( ai::manager::raise_turn_started() ); //This line throws exception from here: https://github.com/wesnoth/wesnoth/blob/ac96a2b91b3276e20b682210617cf87d1e0d366a/src/playsingle_controller.cpp#L954
if(do_autosaves_ && level_result_ == NONE) {
savegame::autosave_savegame save(gamestate_, *gui_, to_config(), preferences::save_compression_format());
@ -848,6 +839,7 @@ void playsingle_controller::before_human_turn()
if(preferences::turn_bell() && level_result_ == NONE) {
sound::play_bell(game_config::sounds::turn_bell);
}
return boost::none;
}
void playsingle_controller::show_turn_dialog(){

2
src/playsingle_controller.hpp
View File

@ -93,7 +93,7 @@ public:
protected:
possible_end_play_signal play_turn();
virtual possible_end_play_signal play_side();
virtual void before_human_turn();
virtual possible_end_play_signal before_human_turn();
void show_turn_dialog();
void execute_gotos();
virtual possible_end_play_signal play_human_turn();