games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-04 22:14:25 +02:00
Code Issues Releases Activity

fixed resurrection corner case

Browse Source
This commit is contained in:
AlexVinS 2017-07-17 02:50:38 +03:00
parent 81ccecedca
commit ef73f416dc
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CStack.cpp
View File

@ -219,7 +219,7 @@ void CHealth::setFromTotal(const int64_t totalHealth)
firstHPleft = totalHealth % unitHealth; firstHPleft = totalHealth % unitHealth;
fullUnits = totalHealth / unitHealth; fullUnits = totalHealth / unitHealth;
if(firstHPleft == 0 && fullUnits > 1) if(firstHPleft == 0 && fullUnits >= 1)
{ {
firstHPleft = unitHealth; firstHPleft = unitHealth;
fullUnits -= 1; fullUnits -= 1;

17
test/battle/CHealthTest.cpp
View File

@ -219,5 +219,22 @@ BOOST_FIXTURE_TEST_CASE(resurrectPermanent, CUnitHealthInfoMock)
checkFullHealth(health, *this); checkFullHealth(health, *this);
} }
BOOST_FIXTURE_TEST_CASE(singleUnitStack, CUnitHealthInfoMock)
{
//related to issue 2612
//one Titan
baseAmount = 1;
maxHealth = 300;
health.init();
checkDamage(health, 1000, 300);
checkEmptyHealth(health, *this);
checkHeal(health, EHealLevel::RESURRECT, EHealPower::PERMANENT, 300, 300);
checkFullHealth(health, *this);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()