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

Fixes #7812, units fully healed don't heal when resting

Browse source
This commit is contained in:
uid67456 2004-02-20 09:21:04 +00:00
parent 4493b3c569
commit b9f8daaa4a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/actions.cpp
View file

@ -730,12 +730,13 @@ void calculate_healing(display& disp, const gamemap& map,
//the unit heals if it's on this side, and it's on a tower or
//it has regeneration, and it is wounded
if(i->second.side() == side) {
if((map.underlying_terrain(map[i->first.x][i->first.y]) == gamemap::TOWER ||
i->second.type().regenerates()) &&
i->second.hitpoints() < i->second.max_hitpoints()) {
if(i->second.hitpoints() < i->second.max_hitpoints()){
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;
} else if(i->second.is_resting()){
amount_healed = game_config::rest_heal_amount;
}
}
i->second.set_resting(true);
if(amount_healed != 0)