games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

renamed CBonusSystemNode::popBonuses to removeBonusesRecursive

Browse Source
This commit is contained in:
Henning Koehler
2018-03-05 19:51:35 +13:00
committed by ArseniyShestakov
parent 4c0a67041b
commit d3e4fc6e7a
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/battle/BattleInfo.cpp
View File

@@ -781,7 +781,7 @@ void BattleInfo::nextTurn(uint32_t unitId)
CStack * st = getStack(activeStack);
//remove bonuses that last until when stack gets new turn
st->popBonuses(Bonus::UntilGetsTurn);
st->removeBonusesRecursive(Bonus::UntilGetsTurn);
st->afterGetsTurn();
}
@@ -852,7 +852,7 @@ void BattleInfo::setUnitState(uint32_t id, const JsonNode & data, int64_t health
if(healthDelta < 0)
{
changedStack->popBonuses(Bonus::UntilBeingAttacked);
changedStack->removeBonusesRecursive(Bonus::UntilBeingAttacked);
}
resurrected = resurrected || (killed && changedStack->alive());
@@ -881,7 +881,7 @@ void BattleInfo::setUnitState(uint32_t id, const JsonNode & data, int64_t health
else
return false;
};
changedStack->popBonuses(selector);
changedStack->removeBonusesRecursive(selector);
}
if(!changedStack->alive() && changedStack->isClone())
@@ -989,7 +989,7 @@ void BattleInfo::removeUnitBonus(uint32_t id, const std::vector<Bonus> & bonus)
&& one.effectRange == b->effectRange
&& one.description == b->description;
};
sta->popBonuses(selector);
sta->removeBonusesRecursive(selector);
}
}