From 4eb40973dd359289d91e8a21df2b7b64c896999c Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Wed, 28 May 2014 00:48:40 +0200 Subject: [PATCH] fix indention & remove commented out code --- src/play_controller.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/play_controller.cpp b/src/play_controller.cpp index 0b36fc63325e..9f1c6c70148b 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -810,14 +810,13 @@ void play_controller::finish_side_turn(){ const std::string turn_num = str_cast(turn()); const std::string side_num = str_cast(player_number_); - if(true) //RAII block - { + + { //Block for set_scontext_synced set_scontext_synced sync(1); - //random_new::set_random_determinstic deterministic(resources::gamedata->rng()); - game_events::fire("side turn end"); - game_events::fire("side "+ side_num + " turn end"); - game_events::fire("side turn " + turn_num + " end"); - game_events::fire("side " + side_num + " turn " + turn_num + " end"); + game_events::fire("side turn end"); + game_events::fire("side "+ side_num + " turn end"); + game_events::fire("side turn " + turn_num + " end"); + game_events::fire("side " + side_num + " turn " + turn_num + " end"); } // This is where we refog, after all of a side's events are done. actions::recalculate_fog(player_number_); @@ -837,7 +836,6 @@ void play_controller::finish_side_turn(){ void play_controller::finish_turn() { set_scontext_synced sync(2); - //random_new::set_random_determinstic deterministic(resources::gamedata->rng()); const std::string turn_num = str_cast(turn()); game_events::fire("turn end"); game_events::fire("turn " + turn_num + " end");