From 890f6f0fcebccb7f6d5b1f3434069f10adff390d Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Thu, 29 May 2014 22:12:16 -0400 Subject: [PATCH] remove more unnecessary arguments, from play_controller::play_side --- src/play_controller.hpp | 2 +- src/playmp_controller.cpp | 4 ++-- src/playmp_controller.hpp | 2 +- src/playsingle_controller.cpp | 19 +++++++++---------- src/playsingle_controller.hpp | 2 +- src/replay_controller.cpp | 8 ++++---- src/replay_controller.hpp | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/play_controller.hpp b/src/play_controller.hpp index 910df81d0105..954d72dbd855 100644 --- a/src/play_controller.hpp +++ b/src/play_controller.hpp @@ -112,7 +112,7 @@ class play_controller : public controller_base, public events::observer, public void maybe_do_init_side(bool is_replay = false, bool only_visual = false); void do_init_side(bool is_replay = false, bool only_visual = false); - virtual void play_side(const unsigned int side_number, bool save) = 0; + virtual void play_side(bool save) = 0; virtual void force_end_turn() = 0; virtual void force_end_level(LEVEL_RESULT res) = 0; diff --git a/src/playmp_controller.cpp b/src/playmp_controller.cpp index 9a21cb420576..aedcf3c379fe 100644 --- a/src/playmp_controller.cpp +++ b/src/playmp_controller.cpp @@ -92,7 +92,7 @@ void playmp_controller::stop_network(){ LOG_NG << "network processing stopped"; } -void playmp_controller::play_side(const unsigned int side_number, bool save) +void playmp_controller::play_side(bool save) { utils::string_map player; player["name"] = current_team().current_player(); @@ -101,7 +101,7 @@ void playmp_controller::play_side(const unsigned int side_number, bool save) gui_->send_notification(_("Turn changed"), turn_notification_msg); // Proceed with the parent function. - playsingle_controller::play_side(side_number, save); + playsingle_controller::play_side(save); } void playmp_controller::before_human_turn(bool save){ diff --git a/src/playmp_controller.hpp b/src/playmp_controller.hpp index 379b6a67e10b..bbc6969bf84f 100644 --- a/src/playmp_controller.hpp +++ b/src/playmp_controller.hpp @@ -48,7 +48,7 @@ class playmp_controller : public playsingle_controller, public events::pump_moni virtual void stop_network(); virtual bool can_execute_command(const hotkey::hotkey_command& command, int index=-1) const; - virtual void play_side(const unsigned int side_number, bool save); + virtual void play_side(bool save); virtual void before_human_turn(bool save); virtual void play_human_turn(); virtual void after_human_turn(); diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp index 324be1cedf5d..ed7f6a925c3a 100644 --- a/src/playsingle_controller.cpp +++ b/src/playsingle_controller.cpp @@ -633,7 +633,7 @@ void playsingle_controller::play_turn(bool save) LOG_NG << "result of replay: " << (replaying_?"true":"false") << "\n"; } else { ai_testing::log_turn_start(player_number_); - play_side(player_number_, save); + play_side(save); } finish_side_turn(); @@ -670,9 +670,8 @@ void playsingle_controller::play_idle_loop() } } -void playsingle_controller::play_side(const unsigned int side_number, bool save) +void playsingle_controller::play_side(bool save) { - assert(static_cast(side_number) == player_number_); //check for team-specific items in the scenario gui_->parse_team_overlays(); @@ -686,7 +685,7 @@ void playsingle_controller::play_side(const unsigned int side_number, bool save) if (!skip_next_turn_) end_turn_ = false; - statistics::reset_turn_stats(teams_[side_number - 1].save_id()); + statistics::reset_turn_stats(teams_[player_number_ - 1].save_id()); if(current_team().is_human() || temporary_human) { LOG_NG << "is human...\n"; @@ -701,13 +700,13 @@ void playsingle_controller::play_side(const unsigned int side_number, bool save) play_human_turn(); } } catch(end_turn_exception& end_turn) { - if (end_turn.redo == side_number) { + if (end_turn.redo == player_number_) { player_type_changed_ = true; // If new controller is not human, // reset gui to prev human one - if (!teams_[side_number-1].is_human()) { + if (!teams_[player_number_-1].is_human()) { browse_ = true; - int s = find_human_team_before(side_number); + int s = find_human_team_before(player_number_); if (s <= 0) s = gui_->playing_side(); update_gui_to_player(s-1); @@ -740,13 +739,13 @@ void playsingle_controller::play_side(const unsigned int side_number, bool save) } catch(end_turn_exception& end_turn) { LOG_NG << "Escaped from idle state with exception!" << std::endl; - if (end_turn.redo == side_number) { + if (end_turn.redo == player_number_) { player_type_changed_ = true; // If new controller is not human, // reset gui to prev human one - if (!teams_[side_number-1].is_human()) { + if (!teams_[player_number_-1].is_human()) { browse_ = true; - int s = find_human_team_before(side_number); + int s = find_human_team_before(player_number_); if (s <= 0) s = gui_->playing_side(); update_gui_to_player(s-1); diff --git a/src/playsingle_controller.hpp b/src/playsingle_controller.hpp index 2cad0ee55689..0bb3521a21ab 100644 --- a/src/playsingle_controller.hpp +++ b/src/playsingle_controller.hpp @@ -75,7 +75,7 @@ class playsingle_controller : public play_controller protected: virtual void play_turn(bool save); - virtual void play_side(const unsigned int side_number, bool save); + virtual void play_side(bool save); virtual void before_human_turn(bool save); void show_turn_dialog(); void execute_gotos(); diff --git a/src/replay_controller.cpp b/src/replay_controller.cpp index 0b0905edc742..8144d0222410 100644 --- a/src/replay_controller.cpp +++ b/src/replay_controller.cpp @@ -342,9 +342,9 @@ void replay_controller::replay_next_side(){ is_playing_ = true; replay_ui_playback_should_start(); - play_side(player_number_ - 1, false); + play_side(false); while (current_team().is_empty()) { - play_side(player_number_ - 1, false); + play_side( false); } if (!skip_replay_ || !is_playing_) { @@ -439,13 +439,13 @@ void replay_controller::play_turn(){ while ( (!last_team) && (!recorder.at_end()) && is_playing_ ){ last_team = static_cast(player_number_) == teams_.size(); - play_side(player_number_ - 1, false); + play_side(false); play_slice(); } } //make only one side move -void replay_controller::play_side(const unsigned int /*team_index*/, bool){ +void replay_controller::play_side(bool){ DBG_REPLAY << "Status turn number: " << turn() << "\n"; DBG_REPLAY << "Replay_Controller turn number: " << current_turn_ << "\n"; diff --git a/src/replay_controller.hpp b/src/replay_controller.hpp index 9047ae2e9336..a3f2eeb339f8 100644 --- a/src/replay_controller.hpp +++ b/src/replay_controller.hpp @@ -62,7 +62,7 @@ class replay_controller : public play_controller private: void init(); virtual void play_turn(); - virtual void play_side(const unsigned int team_index, bool save); + virtual void play_side(bool save); void update_teams(); void update_gui(); void init_replay_display();