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

Bring back end_record_lock(). Reverts part of 2012-11-24T17:32:47Z!jt_coding@verizon.net.

Browse source
This commit is contained in:
J. Tyne 2012-11-24 19:24:46 +00:00
parent b04ed2e3b0
commit 1c8fb5a3ac
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/playsingle_controller.cpp
View file

@ -808,6 +808,20 @@ void playsingle_controller::linger()
#pragma warning (pop)
#endif
void playsingle_controller::end_turn_record()
{
if (!turn_over_)
{
turn_over_ = true;
recorder.end_turn();
}
}
void playsingle_controller::end_turn_record_unlock()
{
turn_over_ = false;
}
hotkey::ACTION_STATE playsingle_controller::get_action_state(hotkey::HOTKEY_COMMAND command, int index) const
{
switch(command) {
@ -826,7 +840,8 @@ void playsingle_controller::after_human_turn()
// Mark the turn as done.
browse_ = true;
recorder.end_turn();
end_turn_record();
end_turn_record_unlock();
// Clear moves from the GUI.
gui_->set_route(NULL);

2
src/playsingle_controller.hpp
View file

@ -77,6 +77,8 @@ protected:
void execute_gotos();
virtual void play_human_turn();
virtual void after_human_turn();
void end_turn_record();
void end_turn_record_unlock();
virtual hotkey::ACTION_STATE get_action_state(hotkey::HOTKEY_COMMAND command, int index) const;
void play_ai_turn();
virtual void play_network_turn();