0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show objectives at the proper time at start of turn (bug 23518)

Browse source
This commit is contained in:
Charles Dang 2015-04-24 01:45:33 +11:00
parent 36451c214f
commit ba3f4129fe
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/play_controller.cpp
View file

@ -867,7 +867,7 @@ void play_controller::check_victory()
{
return;
}
check_objectives();
if (is_regular_game_end()) {
return;
}
@ -886,7 +886,6 @@ void play_controller::check_victory()
if (found_player || found_network_player) {
pump().fire("enemies defeated");
check_objectives();
if (is_regular_game_end()) {
return;
}

2
src/playmp_controller.cpp
View file

@ -170,7 +170,7 @@ void playmp_controller::play_human_turn()
undo_stack_->undo();
}
check_objectives();
play_slice_catch();
if(timer)
{

1
src/playsingle_controller.cpp
View file

@ -575,6 +575,7 @@ void playsingle_controller::play_human_turn() {
end_turn_enable(true);
while(!should_return_to_play_side()) {
check_objectives();
play_slice_catch();
gui_->draw();
}