games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

cleanup

Browse Source
This commit is contained in:
AlexVinS
2016-09-10 09:37:18 +03:00
parent f39e619304
commit f8767a6380
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spells/ISpellMechanics.cpp
View File

@ -38,7 +38,7 @@ BattleSpellCastParameters::BattleSpellCastParameters(const BattleInfo * cb, cons
: spell(spell_), cb(cb), caster(caster), casterColor(caster->getOwner()), casterSide(cb->whatSide(casterColor)), : spell(spell_), cb(cb), caster(caster), casterColor(caster->getOwner()), casterSide(cb->whatSide(casterColor)),
casterHero(nullptr), casterHero(nullptr),
mode(ECastingMode::HERO_CASTING), casterStack(nullptr), mode(ECastingMode::HERO_CASTING), casterStack(nullptr),
spellLvl(-1), effectLevel(-1), effectPower(0), enchantPower(0), effectValue(0) spellLvl(0), effectLevel(0), effectPower(0), enchantPower(0), effectValue(0)
{ {
casterStack = dynamic_cast<const CStack *>(caster); casterStack = dynamic_cast<const CStack *>(caster);
casterHero = dynamic_cast<const CGHeroInstance *>(caster); casterHero = dynamic_cast<const CGHeroInstance *>(caster);

2
server/CGameHandler.cpp
View File

@ -4109,7 +4109,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
bsa.creID = summonedType; bsa.creID = summonedType;
ui64 risedHp = summoner->count * summoner->valOfBonuses(Bonus::DAEMON_SUMMONING, bsa.creID.toEnum()); ui64 risedHp = summoner->count * summoner->valOfBonuses(Bonus::DAEMON_SUMMONING, bsa.creID.toEnum());
ui64 targetHealth = destStack->getCreature()->MaxHealth() * destStack->baseAmount;//todo: ignore AGE effect ui64 targetHealth = destStack->getCreature()->MaxHealth() * destStack->baseAmount;
ui64 canRiseHp = std::min(targetHealth, risedHp); ui64 canRiseHp = std::min(targetHealth, risedHp);
ui32 canRiseAmount = canRiseHp / VLC->creh->creatures.at(bsa.creID)->MaxHealth(); ui32 canRiseAmount = canRiseHp / VLC->creh->creatures.at(bsa.creID)->MaxHealth();