From 1c54a70c40a8713489408a8101fc9a7b72255542 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sat, 18 Mar 2017 08:02:04 +1100 Subject: [PATCH] Connect Engine: removed unused function relating to GUI1 drag-and-drop side reordering --- src/game_initialization/connect_engine.cpp | 33 ---------------------- src/game_initialization/connect_engine.hpp | 2 -- 2 files changed, 35 deletions(-) diff --git a/src/game_initialization/connect_engine.cpp b/src/game_initialization/connect_engine.cpp index 46bd8247484d..959dc1ba9242 100644 --- a/src/game_initialization/connect_engine.cpp +++ b/src/game_initialization/connect_engine.cpp @@ -1219,39 +1219,6 @@ bool side_engine::available_for_user(const std::string& name) const return false; } -bool side_engine::swap_sides_on_drop_target(const unsigned drop_target) { - assert(drop_target < parent_.side_engines_.size()); - side_engine& target = *parent_.side_engines_[drop_target]; - - const std::string target_id = target.player_id_; - const ng::controller target_controller = target.controller_; - const std::string target_ai = target.ai_algorithm_; - - if((controller_lock_ || target.controller_lock_) && - (controller_options_ != target.controller_options_)) { - - return false; - } - - target.ai_algorithm_ = ai_algorithm_; - if(player_id_.empty()) { - target.player_id_.clear(); - target.set_controller(controller_); - } else { - target.place_user(player_id_); - } - - ai_algorithm_ = target_ai; - if(target_id.empty()) { - player_id_.clear(); - set_controller(target_controller); - } else { - place_user(target_id); - } - - return true; -} - void side_engine::resolve_random(rand_rng::mt_rng & rng, const std::vector & avoid_faction_ids) { if(parent_.params_.saved_game) { diff --git a/src/game_initialization/connect_engine.hpp b/src/game_initialization/connect_engine.hpp index 6e92b69ff513..25bc15d61849 100644 --- a/src/game_initialization/connect_engine.hpp +++ b/src/game_initialization/connect_engine.hpp @@ -161,8 +161,6 @@ class side_engine // players are allowed. bool available_for_user(const std::string& name = "") const; - bool swap_sides_on_drop_target(const unsigned drop_target); - void resolve_random( rand_rng::mt_rng & rng, const std::vector & avoid_faction_ids = std::vector()); // Resets this side to its default state.