upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 18:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor saved_game::set_default_save_id and rename

Browse Source
This commit is contained in:
gfgtdf 2015-03-26 18:47:35 +01:00
parent f5669e1e35
commit 236227e967
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/saved_game.cpp
View File

@ -45,6 +45,7 @@
#include "serialization/binary_or_text.hpp" #include "serialization/binary_or_text.hpp"
#include "util.hpp" #include "util.hpp"
#include <boost/assign/list_of.hpp>
#include <boost/range/adaptors.hpp> #include <boost/range/adaptors.hpp>
#include <boost/range/algorithm/copy.hpp> #include <boost/range/algorithm/copy.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@ -149,27 +150,28 @@ void saved_game::write_general_info(config_writer& out) const
out.write_child("multiplayer", mp_settings_.to_config()); out.write_child("multiplayer", mp_settings_.to_config());
} }
void saved_game::set_defaults()
void saved_game::set_default_save_id()
{ {
//Set this default value immideately after reading the scenario is importent because otherwise static const std::vector<std::string> team_defaults = boost::assign::list_of
//we might endup settings this value to the multiplayer players name, which would break carryover. ("carryover_percentage")
//(doing this in at config loading in game_config would be ok too i think.) ("carryover_add")
const config::attribute_value* carryover_percentage = starting_pos_.get("carryover_percentage"); ;
const config::attribute_value* carryover_add = starting_pos_.get("carryover_add");
BOOST_FOREACH(config& side, starting_pos_.child_range("side")) BOOST_FOREACH(config& side, starting_pos_.child_range("side"))
{ {
// Set save_id default value directly after loading to its default to prevent different default behaviour in mp_connect code and sp code.
if(side["save_id"].empty()) if(side["save_id"].empty())
{ {
side["save_id"] = side["id"]; side["save_id"] = side["id"];
} }
if(carryover_percentage && side["carryover_percentage"].empty()) // Set some team specific values to their defaults specified in scenario
BOOST_FOREACH(const std::string& att_name, team_defaults)
{ {
side["carryover_percentage"] = *carryover_percentage; const config::attribute_value* scenario_value = starting_pos_.get(att_name);
config::attribute_value& team_value = side[att_name];
if(scenario_value && team_value.empty())
{
team_value = *scenario_value;
} }
if(carryover_add && side["carryover_add"].empty())
{
side["carryover_add"] = *carryover_add;
} }
} }
} }
@ -192,7 +194,7 @@ void saved_game::expand_scenario()
mp_settings_.hash = scenario.hash(); mp_settings_.hash = scenario.hash();
update_label(); update_label();
set_default_save_id(); set_defaults();
} }
else else
{ {
@ -322,7 +324,7 @@ void saved_game::expand_random_scenario()
scenario_new["id"] = starting_pos_["id"]; scenario_new["id"] = starting_pos_["id"];
starting_pos_ = scenario_new; starting_pos_ = scenario_new;
update_label(); update_label();
set_default_save_id(); set_defaults();
} }
//it looks like we support a map= where map=filename equals more or less map_data={filename} //it looks like we support a map= where map=filename equals more or less map_data={filename}
if(starting_pos_["map_data"].empty() && !starting_pos_["map"].empty()) { if(starting_pos_["map_data"].empty() && !starting_pos_["map"].empty()) {

2
src/saved_game.hpp
View File

@ -98,7 +98,7 @@ public:
/* removes network_ai and network controller types*/ /* removes network_ai and network controller types*/
void unify_controllers(); void unify_controllers();
void set_default_save_id(); void set_defaults();
replay_recorder_base& get_replay() { return replay_data_; } replay_recorder_base& get_replay() { return replay_data_; }
const replay_recorder_base& get_replay() const { return replay_data_; } const replay_recorder_base& get_replay() const { return replay_data_; }
private: private: