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

Merge branch 'master' of git://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-05-26 19:08:06 -04:00
commit 0c504c5434
2 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/playmp_controller.cpp
View file

@ -175,8 +175,7 @@ void playmp_controller::play_human_turn(){
end_turn_enable(true);
}
while(!end_turn_) {
try {
turn_info_send send_safe(*turn_data_);
config cfg;
if(network_reader_.read(cfg)) {
@ -217,11 +216,7 @@ void playmp_controller::play_human_turn(){
play_slice();
check_end_level();
} catch(const end_level_exception&) {
turn_data_->send_data();
throw;
}
if (!linger_ && (current_team().countdown_time() > 0) && gamestate_.mp_settings().mp_countdown) {
SDL_Delay(1);
const int ticks = SDL_GetTicks();
@ -246,15 +241,12 @@ void playmp_controller::play_human_turn(){
// Current solution end remaining turns automatically
current_team().set_countdown_time(10);
}
turn_data_->send_data();
throw end_turn_exception();
}
}
gui_->draw();
turn_data_->send_data();
}
}
@ -266,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();
}
}

20
src/playturn.hpp
View file

@ -77,4 +77,24 @@ private:
playturn_network_adapter& network_reader_;
};
/**
class that sends data on destruction
to make sure data is sended in any case.
*/
class turn_info_send
{
public:
turn_info_send(turn_info& sender)
: sender_(sender)
{
}
~turn_info_send()
{
sender_.send_data();
}
private:
turn_info& sender_;
};
#endif