From ea3fe5c8342debd37d7f78090f5b7cb2909b100e Mon Sep 17 00:00:00 2001 From: Eugen Jiresch Date: Tue, 23 Jun 2009 07:29:00 +0000 Subject: [PATCH] removed gamestatus member from class turn_info --- src/playmp_controller.cpp | 10 +++++----- src/playsingle_controller.cpp | 6 +++--- src/playturn.cpp | 4 ++-- src/playturn.hpp | 3 +-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/playmp_controller.cpp b/src/playmp_controller.cpp index bb687523f9d..f39946dc452 100644 --- a/src/playmp_controller.cpp +++ b/src/playmp_controller.cpp @@ -157,7 +157,7 @@ void playmp_controller::before_human_turn(bool save){ LOG_NG << "playmp::before_human_turn...\n"; playsingle_controller::before_human_turn(save); - turn_data_ = new turn_info(gamestate_,status_,tod_manager_, + turn_data_ = new turn_info(gamestate_,tod_manager_, *gui_,map_,teams_,player_number_,units_,replay_sender_, undo_stack_, *this); turn_data_->replay_error().attach_handler(this); turn_data_->host_transfer().attach_handler(this); @@ -351,7 +351,7 @@ void playmp_controller::linger(upload_log& log) try { // reimplement parts of play_side() player_number_ = first_player_; - turn_data_ = new turn_info(gamestate_, status_, tod_manager_, + turn_data_ = new turn_info(gamestate_, tod_manager_, *gui_,map_, teams_, player_number_, units_, replay_sender_, undo_stack_,*this); turn_data_->replay_error().attach_handler(this); @@ -397,7 +397,7 @@ void playmp_controller::wait_for_upload() const bool set_turn_data = (turn_data_ == 0); if(set_turn_data) { - turn_data_ = new turn_info(gamestate_,status_,tod_manager_, + turn_data_ = new turn_info(gamestate_,tod_manager_, *gui_,map_,teams_,player_number_,units_,replay_sender_, undo_stack_, *this); turn_data_->replay_error().attach_handler(this); turn_data_->host_transfer().attach_handler(this); @@ -476,7 +476,7 @@ void playmp_controller::play_network_turn(){ LOG_NG << "is networked...\n"; gui_->enable_menu("endturn", false); - turn_info turn_data(gamestate_,status_,tod_manager_,*gui_, + turn_info turn_data(gamestate_,tod_manager_,*gui_, map_,teams_,player_number_,units_, replay_sender_, undo_stack_,*this); turn_data.replay_error().attach_handler(this); turn_data.host_transfer().attach_handler(this); @@ -552,7 +552,7 @@ void playmp_controller::process_oos(const std::string& err_msg){ } void playmp_controller::handle_generic_event(const std::string& name){ - turn_info turn_data(gamestate_,status_,tod_manager_,*gui_, + turn_info turn_data(gamestate_,tod_manager_,*gui_, map_,teams_,player_number_,units_, replay_sender_, undo_stack_, *this); if (name == "ai_user_interact"){ diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp index f9de6540ad6..b4c0c351542 100644 --- a/src/playsingle_controller.cpp +++ b/src/playsingle_controller.cpp @@ -550,7 +550,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(gamestate_, status_, tod_manager_, *gui_, map_, + turn_info turn_data(gamestate_, tod_manager_, *gui_, map_, teams_, player_number_, units_, replay_sender_, undo_stack_,*this); recorder.end_turn(); turn_data.sync_network(); @@ -573,7 +573,7 @@ void playsingle_controller::play_turn(bool save) // If a side is dead end the turn. if (current_team().is_human() && side_units(units_, player_number_) == 0) { - turn_info turn_data(gamestate_, status_, tod_manager_, *gui_, map_, + turn_info turn_data(gamestate_, tod_manager_, *gui_, map_, teams_, player_number_, units_, replay_sender_, undo_stack_, *this); recorder.end_turn(); turn_data.sync_network(); @@ -832,7 +832,7 @@ void playsingle_controller::play_ai_turn(){ const cursor::setter cursor_setter(cursor::WAIT); - turn_info turn_data(gamestate_,status_,tod_manager_,*gui_, + turn_info turn_data(gamestate_,tod_manager_,*gui_, map_, teams_, player_number_, units_, replay_sender_, undo_stack_, *this); try { diff --git a/src/playturn.cpp b/src/playturn.cpp index f0477d33ec5..ea55e2a07af 100644 --- a/src/playturn.cpp +++ b/src/playturn.cpp @@ -29,10 +29,10 @@ static lg::log_domain log_network("network"); #define ERR_NW LOG_STREAM(err, log_network) turn_info::turn_info(game_state& state_of_game, - const gamestatus& status, const tod_manager& tod_mng, game_display& gui, gamemap& map, + const tod_manager& tod_mng, game_display& gui, gamemap& map, std::vector& teams, unsigned int team_num, unit_map& units, replay_network_sender& replay_sender, undo_list& undo_stack, play_controller& controller) - : state_of_game_(state_of_game), status_(status), tod_manager_(tod_mng), + : state_of_game_(state_of_game), tod_manager_(tod_mng), gui_(gui), map_(map), teams_(teams), team_num_(team_num), units_(units), undo_stack_(undo_stack), replay_sender_(replay_sender), replay_error_("network_replay_error"), diff --git a/src/playturn.hpp b/src/playturn.hpp index ed2df204d78..44158523068 100644 --- a/src/playturn.hpp +++ b/src/playturn.hpp @@ -37,7 +37,7 @@ class turn_info { public: turn_info(game_state& state_of_game, - const gamestatus& status, const tod_manager& tod_mng, game_display& gui, gamemap& map, + const tod_manager& tod_mng, game_display& gui, gamemap& map, std::vector& teams, unsigned int team_num, unit_map& units, replay_network_sender& network_sender, undo_list& undo_stack, play_controller& controller); @@ -71,7 +71,6 @@ private: static void change_side_controller(const std::string& side, const std::string& player, bool own_side=false); game_state& state_of_game_; - const gamestatus& status_; const tod_manager& tod_manager_; game_display& gui_; gamemap& map_;