Skip to content

Commit

Permalink
simplify playsingle_controller::play_side()
Browse files Browse the repository at this point in the history
  • Loading branch information
gfgtdf committed Mar 26, 2015
1 parent 8c068ca commit f5669e1
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/playsingle_controller.cpp
Expand Up @@ -527,7 +527,6 @@ void playsingle_controller::play_side()
return;
}
if ( !player_type_changed_ ) {
sync_end_turn();
after_human_turn();
}
LOG_NG << "human finished turn...\n";
Expand All @@ -543,11 +542,6 @@ void playsingle_controller::play_side()
if(is_regular_game_end()) {
return;
}
if(!player_type_changed_)
{
sync_end_turn();
}

} else if(current_team().is_network()) {
play_network_turn();
if(is_regular_game_end()) {
Expand All @@ -571,6 +565,7 @@ void playsingle_controller::play_side()
} while (player_type_changed_);
// Keep looping if the type of a team (human/ai/networked)
// has changed mid-turn
sync_end_turn();
assert(end_turn_ == END_TURN_SYNCED);
skip_next_turn_ = false;
}
Expand Down

0 comments on commit f5669e1

Please sign in to comment.