games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Code Issues Releases Activity

Resolve merge conflict

Browse Source
This commit is contained in:
kodobi 2024-10-30 18:48:09 +01:00
parent 44f479be89
commit 2678665f67
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/windows/CCreatureWindow.cpp
View File

@ -545,17 +545,8 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s
const auto hero = (battleStack->unitSide() == BattleSide::ATTACKER)
? battleInterface->attackingHeroInstance
: battleInterface->defendingHeroInstance;
<<<<<<< HEAD
dmgMultiply += hero->getPrimSkillLevel(PrimarySkill::ATTACK);
=======
// Check if the hero has a ballista in the war machine slot
if (hero && hero->getStack(SlotID::WAR_MACHINES_SLOT).type->warMachine.BALLISTA)
{
dmgMultiply += hero->getPrimSkillLevel(PrimarySkill::ATTACK);
}
>>>>>>> 389f8b678befdb4f3dc3bdcdf4d5847fc0f5129d
dmgMultiply += hero->getPrimSkillLevel(PrimarySkill::ATTACK);
}
icons = std::make_shared<CPicture>(ImagePath::builtin("stackWindow/icons"), 117, 32);