Mercurial > mm7

comparison Actor.cpp @ 2292:ab8797ea43b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru319::CalcMagicalDamageToActor small cleanups
author Grumpy7
date Sun, 16 Mar 2014 19:37:28 +0100
parents 69661f22ff03
children b0f10ef66e00
comparison
equal deleted inserted replaced
2291:69661f22ff03 2292:ab8797ea43b6
2805 for(size_t i = 0; i < uNumActors; i++) 2805 for(size_t i = 0; i < uNumActors; i++)
2806 { 2806 {
2807 pActor=&pActors[i]; 2807 pActor=&pActors[i];
2808 if ( pActor->CanAct() ) 2808 if ( pActor->CanAct() )
2809 { 2809 {
2810 sDmg = stru_50C198.CalcMagicalDamageToActor(pActor, 5, v4); 2810 sDmg = stru_50C198.CalcMagicalDamageToActor(pActor, (DAMAGE_TYPE)5, v4);
2811 pActor->sCurrentHP -= stru_50C198.CalcMagicalDamageToActor(pActor, 5, v4); 2811 pActor->sCurrentHP -= stru_50C198.CalcMagicalDamageToActor(pActor, (DAMAGE_TYPE)5, v4);
2812 if ( sDmg ) 2812 if ( sDmg )
2813 { 2813 {
2814 if ( pActor->sCurrentHP >= 0 ) 2814 if ( pActor->sCurrentHP >= 0 )
2815 Actor::AI_Stun(i, 4, 0); 2815 Actor::AI_Stun(i, 4, 0);
2816 else 2816 else
3552 if ( pMonster->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 ) 3552 if ( pMonster->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 )
3553 uDamageAmount = 0; 3553 uDamageAmount = 0;
3554 v61 = stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, uDamageAmount); 3554 v61 = stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, uDamageAmount);
3555 if ( !projectileSprite && player->IsUnarmed() && player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uExpireTime > 0 ) 3555 if ( !projectileSprite && player->IsUnarmed() && player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uExpireTime > 0 )
3556 { 3556 {
3557 v61 += stru_50C198.CalcMagicalDamageToActor(pMonster, 8, player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uPower); 3557 v61 += stru_50C198.CalcMagicalDamageToActor(pMonster, (DAMAGE_TYPE)8, player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uPower);
3558 } 3558 }
3559 uDamageAmount = v61; 3559 uDamageAmount = v61;
3560 if ( IsAdditionalDamagePossible ) 3560 if ( IsAdditionalDamagePossible )
3561 { 3561 {
3562 if ( projectileSprite ) 3562 if ( projectileSprite )