Mercurial > mm7

comparison Player.cpp @ 2293:b0f10ef66e00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru319::CalcMagicalDamageToActor moved to Actor class
author Grumpy7
date Sun, 16 Mar 2014 19:42:29 +0100
parents ab8797ea43b6
children 9551756f46c4
comparison
equal deleted inserted replaced
2292:ab8797ea43b6 2293:b0f10ef66e00
7309 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) 7309 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 )
7310 { 7310 {
7311 int actorState = actorPtr->uAIState; 7311 int actorState = actorPtr->uAIState;
7312 if ( actorState != Dying && actorState != Dead) 7312 if ( actorState != Dying && actorState != Dead)
7313 { 7313 {
7314 int reflectedDamage = stru_50C198.CalcMagicalDamageToActor(actorPtr, (DAMAGE_TYPE)damageType, dmgToReceive); 7314 int reflectedDamage = actorPtr->CalcMagicalDamageToActor((DAMAGE_TYPE)damageType, dmgToReceive);
7315 actorPtr->sCurrentHP -= reflectedDamage; 7315 actorPtr->sCurrentHP -= reflectedDamage;
7316 if ( reflectedDamage >= 0 ) 7316 if ( reflectedDamage >= 0 )
7317 { 7317 {
7318 if ( actorPtr->sCurrentHP >= 1 ) 7318 if ( actorPtr->sCurrentHP >= 1 )
7319 { 7319 {
7501 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 ) 7501 if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 )
7502 { 7502 {
7503 unsigned __int16 actorState = actorPtr->uAIState; 7503 unsigned __int16 actorState = actorPtr->uAIState;
7504 if ( actorState != Dying && actorState != Dead) 7504 if ( actorState != Dying && actorState != Dead)
7505 { 7505 {
7506 recvdMagicDmg = stru_50C198.CalcMagicalDamageToActor(actorPtr, (DAMAGE_TYPE)damageType, reflectedDmg); 7506 recvdMagicDmg = actorPtr->CalcMagicalDamageToActor((DAMAGE_TYPE)damageType, reflectedDmg);
7507 actorPtr->sCurrentHP -= recvdMagicDmg; 7507 actorPtr->sCurrentHP -= recvdMagicDmg;
7508 if ( recvdMagicDmg >= 0 ) 7508 if ( recvdMagicDmg >= 0 )
7509 { 7509 {
7510 if ( actorPtr->sCurrentHP >= 1 ) 7510 if ( actorPtr->sCurrentHP >= 1 )
7511 { 7511 {