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

fix travis build

Browse source
This commit is contained in:
gfgtdf 2015-02-26 21:54:11 +01:00
parent 24809e9f57
commit 68364cec85
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/countdown_clock.cpp
View file

@ -13,9 +13,8 @@ namespace {
}
countdown_clock::countdown_clock(team& team, const mp_game_settings& settings)
countdown_clock::countdown_clock(team& team)
: team_(team)
, settings_(settings)
, last_timestamp_(SDL_GetTicks())
, playing_sound_(false)
{

3
src/countdown_clock.hpp
View file

@ -7,7 +7,7 @@ struct mp_game_settings;
class countdown_clock : public events::pump_monitor
{
public:
countdown_clock(team& team, const mp_game_settings& settings);
countdown_clock(team& team);
~countdown_clock();
/// @returns ticks passed since last update
/// @param new_timestamp latest result of SDL_GetTicks()
@ -21,7 +21,6 @@ public:
void maybe_play_sound();
private:
team& team_;
const mp_game_settings& settings_;
int last_timestamp_;
bool playing_sound_;
};

6
src/playmp_controller.cpp
View file

@ -118,7 +118,7 @@ possible_end_play_signal playmp_controller::play_human_turn()
remove_blindfold();
boost::scoped_ptr<countdown_clock> timer;
if(!linger_ && saved_game_.mp_settings().mp_countdown) {
timer.reset(new countdown_clock(current_team(), saved_game_.mp_settings()));
timer.reset(new countdown_clock(current_team()));
}
show_turn_dialog();
if(undo_stack_->can_undo()) {
@ -161,7 +161,7 @@ possible_end_play_signal playmp_controller::play_human_turn()
while( undo_stack_->can_undo() )
undo_stack_->undo();
return restart_turn_struct();
return possible_end_play_signal(restart_turn_struct());
}
else if(res == turn_info::PROCESS_END_LINGER)
{
@ -216,7 +216,7 @@ possible_end_play_signal playmp_controller::play_idle_loop()
if (res == turn_info::PROCESS_RESTART_TURN)
{
return restart_turn_struct();
return possible_end_play_signal(restart_turn_struct());
}
}