games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #560 from dydzio0614/bug2814

Browse Source 
Fix for arrow cart at bank fights
This commit is contained in:
Alexander Shishkin
2019-03-24 10:20:58 +03:00
committed by GitHub
parent db83b3641c 9e5abeec35
commit 87f216ac0d
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CStack.cpp
View File

@@ -304,17 +304,30 @@ int32_t CStack::unitBaseAmount() const
bool CStack::unitHasAmmoCart(const battle::Unit * unit) const bool CStack::unitHasAmmoCart(const battle::Unit * unit) const
{ {
bool hasAmmoCart = false;
for(const CStack * st : battle->stacks) for(const CStack * st : battle->stacks)
{ {
if(battle->battleMatchOwner(st, unit, true) && st->getCreature()->idNumber == CreatureID::AMMO_CART && st->alive()) if(battle->battleMatchOwner(st, unit, true) && st->getCreature()->idNumber == CreatureID::AMMO_CART)
{ {
hasAmmoCart = true; if(st->alive())
break; {
return true;
}
else
{
return false;
}
} }
} }
return hasAmmoCart; //ammo cart works during creature bank battle while not on battlefield
auto ownerHero = battle->battleGetOwnerHero(unit);
if(ownerHero && ownerHero->artifactsWorn.find(ArtifactPosition::MACH2) != ownerHero->artifactsWorn.end())
{
if(battle->battleGetOwnerHero(unit)->artifactsWorn.at(ArtifactPosition::MACH2).artifact->artType->id == ArtifactID::AMMO_CART)
{
return true;
}
}
return false; //will be always false if trying to examine enemy hero in "special battle"
} }
PlayerColor CStack::unitEffectiveOwner(const battle::Unit * unit) const PlayerColor CStack::unitEffectiveOwner(const battle::Unit * unit) const