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

use turn_info_send in play_idle_loop

Browse source
This commit is contained in:
gfgtdf 2014-05-27 00:50:32 +02:00
parent 12f117400c
commit 52f271a390
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/playmp_controller.cpp
View file

@ -258,31 +258,25 @@ void playmp_controller::play_idle_loop()
while (!end_turn_)
{
try {
config cfg;
if(network_reader_.read(cfg)) {
turn_info::PROCESS_DATA_RESULT res = turn_data_->process_network_data(cfg, skip_replay_);
if (res == turn_info::PROCESS_RESTART_TURN || res == turn_info::PROCESS_RESTART_TURN_TEMPORARY_LOCAL)
{
throw end_turn_exception(gui_->playing_side());
}
turn_info_send send_safe(*turn_data_);
config cfg;
if(network_reader_.read(cfg)) {
turn_info::PROCESS_DATA_RESULT res = turn_data_->process_network_data(cfg, skip_replay_);
if (res == turn_info::PROCESS_RESTART_TURN || res == turn_info::PROCESS_RESTART_TURN_TEMPORARY_LOCAL)
{
throw end_turn_exception(gui_->playing_side());
}
play_slice();
check_end_level();
} catch(const end_level_exception&) {
turn_data_->send_data();
throw;
}
play_slice();
check_end_level();
if (!linger_) {
SDL_Delay(1);
}
gui_->draw();
turn_data_->send_data();
}
}