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

fix gold carryover.

Browse Source 
http://gna.org/bugs/?23118
This commit is contained in:
gfgtdf 2014-12-28 19:22:36 +01:00
parent 61d93802e4
commit 57227f4030
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/carryover.cpp
View File

@ -150,7 +150,7 @@ carryover_info::carryover_info(const config& cfg, bool from_snpashot)
, next_scenario_(cfg["next_scenario"])
, next_underlying_unit_id_(cfg["next_underlying_unit_id"].to_int(0))
{
int turns_left = cfg["turns"].to_int() - cfg["turn_at"].to_int();
int turns_left = std::max(0, cfg["turns"].to_int() - cfg["turn_at"].to_int());
end_level_.read(cfg.child_or_empty("end_level_data"));
BOOST_FOREACH(const config& side, cfg.child_range("side"))
{
@ -165,12 +165,8 @@ carryover_info::carryover_info(const config& cfg, bool from_snpashot)
{
//adjust gold
//base_income is side["income"] + game_config::base_income;
int finishing_bonus_per_turn = cfg["map_villages_num"] * side["village_gold"] + side["income"] + game_config::base_income;
int finishing_bonus = std::max(0, finishing_bonus_per_turn * turns_left);
if(end_level_.gold_bonus)
{
carryover_sides_.back().set_gold(div100rounded((finishing_bonus + side["gold"]) * end_level_.carryover_percentage), end_level_.carryover_add);
}
int finishing_bonus_per_turn = end_level_.gold_bonus ? cfg["map_villages_num"] * side["village_gold"] + side["income"] + game_config::base_income : 0;
carryover_sides_.back().set_gold(div100rounded((finishing_bonus_per_turn * turns_left + side["gold"]) * end_level_.carryover_percentage), end_level_.carryover_add);
}
}