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

removed game_state::write_player

Browse Source
This commit is contained in:
Eugen Jiresch 2009-07-21 09:20:38 +00:00
parent 8c1dc58f06
commit b659429b19
3 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/gamestatus.cpp
View File

@ -205,59 +205,6 @@ game_state::game_state() :
classification_()
{}
void game_state::write_player(const std::string& save_id, const player_info& player, config& cfg, const bool use_snapshot) const
{
cfg["name"] = player.name;
cfg["save_id"]=save_id;
//FIXME: with the current consistency definition of sides by controller, some players may not show up in snapshot.side
//player_info is used until side consistency is fixed
bool side_not_found = false;
//add gold from snapshot
if (use_snapshot) {
if (const config &side = snapshot.find_child("side", "save_id", save_id)) {
cfg["gold"] = side["gold"];
cfg["gold_add"] = side["gold_add"];
assert(cfg["gold"] == str_cast<int>(player.gold));
} else if(const config &snapshot_player = snapshot.find_child("player", "save_id", save_id)) {
cfg["gold"] = snapshot_player["gold"];
cfg["gold_add"] = snapshot_player["gold_add"];
assert(cfg["gold"] == str_cast<int>(player.gold));
} else {
WRN_NG << "side " << save_id << " does not exist in snapshot, using player_info\n";
side_not_found = true;
}
}
//do not store gold if specified by use_snapshot
if (!use_snapshot || side_not_found){
char buf[50];
snprintf(buf,sizeof(buf),"%d",player.gold);
cfg["gold"] = buf;
cfg["gold_add"] = player.gold_add ? "yes" : "no";
}
for(std::vector<unit>::const_iterator i = player.available_units.begin();
i != player.available_units.end(); ++i) {
config new_cfg;
i->write(new_cfg);
cfg.add_child("unit",new_cfg);
DBG_NG << "added unit '" << new_cfg["id"] << "' to player '" << player.name << "'\n";
}
std::stringstream can_recruit;
std::copy(player.can_recruit.begin(),player.can_recruit.end(),std::ostream_iterator<std::string>(can_recruit,","));
std::string can_recruit_str = can_recruit.str();
// Remove the trailing comma
if(can_recruit_str.empty() == false) {
can_recruit_str.resize(can_recruit_str.size()-1);
}
cfg["can_recruit"] = can_recruit_str;
}
void write_players(game_state& gamestate, config& cfg)
{
// If there is already a player config available it means we are loading

1
src/gamestatus.hpp
View File

@ -150,7 +150,6 @@ public:
game_classification& classification() { return classification_; }
const game_classification& classification() const { return classification_; } //FIXME: const getter to allow use from const gamestatus::sog() (see ai.cpp:344) - remove after merge?
void write_player(const std::string& save_id, const player_info& player, config& cfg, const bool use_snapshot = false) const;
/**
* If the game is saved mid-level, we have a series of replay steps
* to take the game up to the position it was saved at.

2
src/team.cpp
View File

@ -424,7 +424,7 @@ void team::write(config& cfg) const
cfg["action_bonus_count"] = str_cast(action_bonus_count_);
}
//write a [player] tag, similar to game_state::write_player()
//write gold, recruit and recall information to a config
void team::write_player(config& cfg) const
{
cfg["name"] = info_.current_player;