upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 01:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused scenario_ variable in game_data

Browse Source
This commit is contained in:
gfgtdf 2015-03-27 17:10:30 +01:00
parent da2253529f
commit 35887b066f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game_data.cpp
View File

@ -42,7 +42,6 @@ game_data::game_data()
, variables_() , variables_()
, phase_(INITIAL) , phase_(INITIAL)
, can_end_turn_(true) , can_end_turn_(true)
, scenario_()
, next_scenario_() , next_scenario_()
{} {}
@ -55,7 +54,6 @@ game_data::game_data(const config& level)
, variables_(level.child_or_empty("variables")) , variables_(level.child_or_empty("variables"))
, phase_(INITIAL) , phase_(INITIAL)
, can_end_turn_(level["can_end_turn"].to_bool(true)) , can_end_turn_(level["can_end_turn"].to_bool(true))
, scenario_(level["id"])
, next_scenario_(level["next_scenario"]) , next_scenario_(level["next_scenario"])
{ {
wml_menu_items_.set_menu_items(level); wml_menu_items_.set_menu_items(level);
@ -70,7 +68,6 @@ game_data::game_data(const game_data& data)
, variables_(data.variables_) , variables_(data.variables_)
, phase_(data.phase_) , phase_(data.phase_)
, can_end_turn_(data.can_end_turn_) , can_end_turn_(data.can_end_turn_)
, scenario_(data.scenario_)
, next_scenario_(data.next_scenario_) , next_scenario_(data.next_scenario_)
{} {}
//throws //throws
@ -138,8 +135,8 @@ void game_data::clear_variable(const std::string& varname)
} }
} }
void game_data::write_snapshot(config& cfg) const { void game_data::write_snapshot(config& cfg) const
cfg["scenario"] = scenario_; {
cfg["next_scenario"] = next_scenario_; cfg["next_scenario"] = next_scenario_;
cfg["can_end_turn"] = can_end_turn_; cfg["can_end_turn"] = can_end_turn_;

2
src/game_data.hpp
View File

@ -108,8 +108,6 @@ private:
config variables_; config variables_;
PHASE phase_; PHASE phase_;
bool can_end_turn_; 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) */ std::string next_scenario_; /**< the scenario coming next (for campaigns) */
}; };