From c621bfde140020b44dc62123d6f2d76656673e48 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Tue, 27 May 2014 02:15:23 +0200 Subject: [PATCH] remove turn_info::team_num_ it's not used anymore. --- src/playmp_controller.cpp | 6 +++--- src/playsingle_controller.cpp | 6 +++--- src/playturn.cpp | 3 +-- src/playturn.hpp | 4 +--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/playmp_controller.cpp b/src/playmp_controller.cpp index b30af3e52b2..934168bdc2b 100644 --- a/src/playmp_controller.cpp +++ b/src/playmp_controller.cpp @@ -452,7 +452,7 @@ void playmp_controller::play_network_turn(){ LOG_NG << "is networked...\n"; end_turn_enable(false); - turn_info turn_data(player_number_, replay_sender_, network_reader_); + turn_info turn_data(replay_sender_, network_reader_); turn_data.host_transfer().attach_handler(this); for(;;) { @@ -509,7 +509,7 @@ void playmp_controller::play_network_turn(){ } void playmp_controller::init_turn_data() { - turn_data_ = new turn_info(player_number_, replay_sender_,network_reader_); + turn_data_ = new turn_info(replay_sender_,network_reader_); turn_data_->host_transfer().attach_handler(this); } @@ -538,7 +538,7 @@ void playmp_controller::process_oos(const std::string& err_msg) const { } void playmp_controller::handle_generic_event(const std::string& name){ - turn_info turn_data(player_number_, replay_sender_, network_reader_); + turn_info turn_data(replay_sender_, network_reader_); if (name == "ai_user_interact"){ playsingle_controller::handle_generic_event(name); diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp index ed1686aa131..7694f9411f0 100644 --- a/src/playsingle_controller.cpp +++ b/src/playsingle_controller.cpp @@ -619,7 +619,7 @@ void playsingle_controller::play_turn(bool save) init_side(player_number_ - 1); } catch (end_turn_exception) { if (current_team().is_network() == false) { - turn_info turn_data(player_number_, replay_sender_,network_reader_); + turn_info turn_data( replay_sender_,network_reader_); recorder.end_turn(); turn_data.sync_network(); } @@ -636,7 +636,7 @@ void playsingle_controller::play_turn(bool save) if (current_team().is_human() && side_units(player_number_) == 0 && (resources::units->size() != 0 || player_number_ != 1)) { - turn_info turn_data(player_number_, replay_sender_, network_reader_); + turn_info turn_data( replay_sender_, network_reader_); recorder.end_turn(); turn_data.sync_network(); continue; @@ -938,7 +938,7 @@ void playsingle_controller::play_ai_turn(){ synced_context::run_in_synced_context("auto_shroud", replay_helper::get_auto_shroud(true)); } - turn_info turn_data(player_number_, replay_sender_, network_reader_); + turn_info turn_data(replay_sender_, network_reader_); try { ai::manager::play_turn(player_number_); diff --git a/src/playturn.cpp b/src/playturn.cpp index 0884e30ef6c..0b240d9f005 100644 --- a/src/playturn.cpp +++ b/src/playturn.cpp @@ -38,8 +38,7 @@ static lg::log_domain log_network("network"); #define ERR_NW LOG_STREAM(err, log_network) -turn_info::turn_info(unsigned team_num, replay_network_sender &replay_sender,playturn_network_adapter &network_reader) : - team_num_(team_num), +turn_info::turn_info(replay_network_sender &replay_sender,playturn_network_adapter &network_reader) : replay_sender_(replay_sender), host_transfer_("host_transfer"), network_reader_(network_reader) diff --git a/src/playturn.hpp b/src/playturn.hpp index 57264f8c92b..975213f3e4b 100644 --- a/src/playturn.hpp +++ b/src/playturn.hpp @@ -26,7 +26,7 @@ class replay_network_sender; class turn_info { public: - turn_info(unsigned team_num, replay_network_sender &network_sender, playturn_network_adapter &network_reader); + turn_info(replay_network_sender &network_sender, playturn_network_adapter &network_reader); ~turn_info(); @@ -68,8 +68,6 @@ private: void do_save(); - unsigned int team_num_; - replay_network_sender& replay_sender_; events::generic_event host_transfer_;