0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added carryover gold handling to game_state::write_players...

Browse source 
...if merge_side is specified
This commit is contained in:
Eugen Jiresch 2009-07-24 13:36:08 +00:00
parent e638a4b584
commit 2c2a5b42ff
2 changed files with 55 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/gamestatus.cpp
View file

@ -172,23 +172,54 @@ void write_players(game_state& gamestate, config& cfg, const bool merge_side)
if (player_cfg.first != player_cfg.second)
return;
//take all sides information from the snapshot (assuming it only contains carryover information)
//take all side tags and add them as players
foreach(const config* snapshot_side, gamestate.snapshot.get_children("side")) {
bool merged = false;
//if a side with the same save_id exists, we merge the player information into this side
//FIXME: carryover gold needs to be sorted here
if (merge_side) {
if (config& c = cfg.find_child("side", "save_id", (*snapshot_side)["save_id"])) {
c.merge_with(*snapshot_side);
merged = true;
} else if (config& c = cfg.find_child("side", "id", (*snapshot_side)["save_id"])) {
c.merge_with(*snapshot_side);
merged = true;
if (merge_side) {
//merge sides/players from starting pos with the scenario cfg
config temp(cfg);
std::vector<std::string> tags;
tags.push_back("side");
tags.push_back("player"); //merge [player] tags for backwards compatibility of saves
foreach (const std::string side_tag, tags) {
foreach (config* carryover_side, gamestate.starting_pos.get_children(side_tag)) {
config *scenario_side = NULL;
if (config& c = temp.find_child("side", "save_id", (*carryover_side)["save_id"])) {
scenario_side = &c;
} else if (config& c = temp.find_child("side", "id", (*carryover_side)["save_id"])) {
scenario_side = &c;
}
if (scenario_side != NULL) {
//we have a matching side in the current scenario
//sort carryover gold
std::string gold = (*scenario_side)["gold"];
if(gold.empty())
gold = "100";
int ngold = lexical_cast_default<int>(gold);
int player_gold = lexical_cast_default<int>((*carryover_side)["gold"]);
if(utils::string_bool((*carryover_side)["gold_add"])) {
ngold += player_gold;
} else if(player_gold >= ngold) {
ngold = player_gold;
}
(*carryover_side)["gold"] = str_cast<int>(ngold);
if ( !(*scenario_side)["gold_add"].empty() ) {
(*carryover_side)["gold_add"] = (*scenario_side)["gold_add"];
}
(*scenario_side).merge_with(*carryover_side);
} else {
//no matching side in the current scenario, we add the persistent information in a [player] tag
temp.add_child("player", (*carryover_side));
}
}
}
if (!merged) {
}
gamestate.starting_pos = temp;
} else {
foreach(const config* snapshot_side, gamestate.snapshot.get_children("side")) {
//take all side tags and add them as players (assuming they only contain carryover information)
cfg.add_child("player", *snapshot_side);
}
}
@ -596,7 +627,11 @@ void game_state::get_player_info(const config& side_cfg,
if ( (player_cfg != NULL) && (!snapshot) ) {
try {
int player_gold = lexical_cast_default<int>((*player_cfg)["gold"]);
if(utils::string_bool((*player_cfg)["gold_add"])) {
if (!player_exists) {
//if we get the persistence information from [side], carryover gold is already sorted
ngold = player_gold;
gold_add = utils::string_bool((*player_cfg)["gold_add"]);
} else if(utils::string_bool((*player_cfg)["gold_add"])) {
ngold += player_gold;
gold_add = true;
} else if(player_gold >= ngold) {
@ -604,7 +639,7 @@ void game_state::get_player_info(const config& side_cfg,
}
} catch (config::error&) {
ERR_NG << "player tag for " << save_id << " does not have gold information\n";
}
}
}
LOG_NG << "set gold to '" << ngold << "'\n";

3
src/playcampaign.cpp
View file

@ -222,12 +222,13 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
starting_pos = gamestate.starting_pos;
scenario = &starting_pos;
} else {
//reload of the scenario, as starting_pos contains carryover information only
LOG_G << "loading scenario: '" << gamestate.classification().scenario << "'\n";
scenario = &game_config.find_child(type, "id", gamestate.classification().scenario);
if (*scenario) {
starting_pos = *scenario;
preload_lua_tags(game_config, starting_pos);
gamestate.starting_pos.merge_with(starting_pos);
write_players(gamestate, starting_pos, true);
scenario = &starting_pos;
} else
scenario = NULL;