Mercurial > mm7
changeset 1965:182d49f28170
pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
| author | Grumpy7 |
|---|---|
| date | Fri, 25 Oct 2013 11:23:34 -0700 |
| parents | 2b6c6ff66823 |
| children | 7840fe323f67 |
| files | Actor.cpp mm7_6.cpp |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Fri Oct 25 11:22:27 2013 -0700 +++ b/Actor.cpp Fri Oct 25 11:23:34 2013 -0700 @@ -553,7 +553,7 @@ v51 = 0; else v51 = 3600 * realPoints; - actorPtr->pActorBuffs[21].Apply( + actorPtr->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].Apply( pParty->uTimePlayed + (signed int)(signed __int64)((double)(v51 << 7) * 0.033333335), masteryLevel, realPoints, @@ -1431,8 +1431,8 @@ v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower; if ( this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime > 0 && this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower > v2 ) v2 = this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower; - if ( this->pActorBuffs[21].uExpireTime > 0 ) - v2 += this->pActorBuffs[21].uPower; + if ( this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime > 0 ) + v2 += this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uPower; v3 = this->pMonsterInfo.uAttack1DamageDiceRolls; v4 = this->pMonsterInfo.uAttack1DamageDiceSides; v5 = this->pMonsterInfo.uAttack1DamageBonus;
--- a/mm7_6.cpp Fri Oct 25 11:22:27 2013 -0700 +++ b/mm7_6.cpp Fri Oct 25 11:23:34 2013 -0700 @@ -306,12 +306,12 @@ } case 73: { - if ( SHIDWORD(pActor->pActorBuffs[21].uExpireTime) < 0 ) + if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime) < 0 ) return 1; - if ( SHIDWORD(pActor->pActorBuffs[21].uExpireTime) > 0 ) + if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime) > 0 ) return 0; v3 = 0; - v4 = LODWORD(pActor->pActorBuffs[21].uExpireTime) == 0; + v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime) == 0; break; } case 5: