From 35887b066ffdf097fea3667f824e21c559b2a068 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Fri, 27 Mar 2015 17:10:30 +0100 Subject: [PATCH] remove unused scenario_ variable in game_data --- src/game_data.cpp | 7 ++----- src/game_data.hpp | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/game_data.cpp b/src/game_data.cpp index 832c4b63ead..752b8432e70 100644 --- a/src/game_data.cpp +++ b/src/game_data.cpp @@ -42,7 +42,6 @@ game_data::game_data() , variables_() , phase_(INITIAL) , can_end_turn_(true) - , scenario_() , next_scenario_() {} @@ -55,7 +54,6 @@ game_data::game_data(const config& level) , variables_(level.child_or_empty("variables")) , phase_(INITIAL) , can_end_turn_(level["can_end_turn"].to_bool(true)) - , scenario_(level["id"]) , next_scenario_(level["next_scenario"]) { wml_menu_items_.set_menu_items(level); @@ -70,7 +68,6 @@ game_data::game_data(const game_data& data) , variables_(data.variables_) , phase_(data.phase_) , can_end_turn_(data.can_end_turn_) - , scenario_(data.scenario_) , next_scenario_(data.next_scenario_) {} //throws @@ -138,8 +135,8 @@ void game_data::clear_variable(const std::string& varname) } } -void game_data::write_snapshot(config& cfg) const { - cfg["scenario"] = scenario_; +void game_data::write_snapshot(config& cfg) const +{ cfg["next_scenario"] = next_scenario_; cfg["can_end_turn"] = can_end_turn_; diff --git a/src/game_data.hpp b/src/game_data.hpp index ac7d29ad958..81931dc4185 100644 --- a/src/game_data.hpp +++ b/src/game_data.hpp @@ -108,8 +108,6 @@ private: config variables_; PHASE phase_; bool can_end_turn_; - //TODO: why do we need this variable? - std::string scenario_; /**< the scenario being played */ std::string next_scenario_; /**< the scenario coming next (for campaigns) */ };