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

Fixes compilation due to changes in callback interface

Browse Source
This commit is contained in:
Ivan Savenko
2023-01-14 19:03:18 +02:00
parent 1418ce4678
commit b86969909a
10 changed files with 39 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/CGameHandler.cpp
View File

@@ -1224,21 +1224,12 @@ int64_t CGameHandler::applyBattleEffects(BattleAttack & bat, std::shared_ptr<bat
bsa.attackerID = attackerState->unitId();
bsa.stackAttacked = def->unitId();
{
BattleAttackInfo bai(attackerState.get(), def, bat.shot());
bai.chargedFields = distance;
BattleAttackInfo bai(attackerState.get(), def, distance, bat.shot());
if(bat.deathBlow())
bai.additiveBonus += 1.0;
if(bat.ballistaDoubleDmg())
bai.additiveBonus += 1.0;
if(bat.lucky())
bai.additiveBonus += 1.0;
//unlucky hit, used only if negative luck is enabled
if(bat.unlucky())
bai.additiveBonus -= 0.5; // FIXME: how bad (and luck in general) should work with following bonuses?
bai.deathBlow = bat.deathBlow();
bai.doubleDamage = bat.ballistaDoubleDmg();
bai.luckyStrike = bat.lucky();
bai.unluckyStrike = bat.unlucky();
auto range = gs->curB->calculateDmgRange(bai);
bsa.damageAmount = gs->curB->getActualDamage(range, attackerState->getCount(), getRandomGenerator());