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

Rest healing stacks with other healing

Browse source
This commit is contained in:
Isaac Clerencia Perez 2004-03-24 00:21:03 +00:00
parent 373a4dc938
commit 32cdedbf37
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/actions.cpp
View file

@ -848,11 +848,8 @@ void calculate_healing(display& disp, const gamemap& map,
if((map.underlying_terrain(map[i->first.x][i->first.y]) == gamemap::TOWER ||
i->second.type().regenerates())) {
amount_healed = game_config::cure_amount;
} else if(i->second.is_resting()){
amount_healed = game_config::rest_heal_amount;
}
}
i->second.set_resting(true);
if(amount_healed != 0)
healed_units.insert(std::pair<gamemap::location,int>(
i->first, amount_healed));
@ -934,6 +931,21 @@ void calculate_healing(display& disp, const gamemap& map,
}
}
for(i = units.begin(); i != units.end(); ++i) {
if(i->second.side() == side) {
if(i->second.is_resting()) {
const std::map<gamemap::location,int>::iterator u =
healed_units.find(i->first);
if(u != healed_units.end()) {
healed_units[i->first] += game_config::rest_heal_amount;
} else {
healed_units.insert(std::pair<gamemap::location,int>(i->first,game_config::rest_heal_amount));
}
}
i->second.set_resting(true);
}
}
for(std::map<gamemap::location,int>::iterator h = healed_units.begin();
h != healed_units.end(); ++h) {