Mercurial > mm7
changeset 1960:f92fc67d66cb
pActorBuffs[16] to pActorBuffs[ACTOR_BUFF_STONESKIN]
| author | Grumpy7 |
|---|---|
| date | Fri, 25 Oct 2013 11:20:24 -0700 |
| parents | 4fbffad6e011 |
| children | 592d604088b3 |
| files | Actor.cpp mm7_6.cpp |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Fri Oct 25 11:19:41 2013 -0700 +++ b/Actor.cpp Fri Oct 25 11:20:24 2013 -0700 @@ -485,7 +485,7 @@ v44 = 3600 * (realPoints + 64); else v44 = 0; - actorPtr->pActorBuffs[16].Apply( + actorPtr->pActorBuffs[ACTOR_BUFF_STONESKIN].Apply( pParty->uTimePlayed + (signed int)(signed __int64)((double)(v44 << 7) * 0.033333335), masteryLevel, realPoints + 5,
--- a/mm7_6.cpp Fri Oct 25 11:19:41 2013 -0700 +++ b/mm7_6.cpp Fri Oct 25 11:20:24 2013 -0700 @@ -336,12 +336,12 @@ } case 38: { - if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) < 0 ) + if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) < 0 ) return 1; - if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) > 0 ) + if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) > 0 ) return 0; v3 = 0; - v4 = LODWORD(pActor->pActorBuffs[16].uExpireTime) == 0; + v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) == 0; } case 46: { @@ -408,8 +408,8 @@ v5 /= 2; if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) v6 = pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uPower; - if ( (signed __int64)pActor->pActorBuffs[16].uExpireTime > 0 && pActor->pActorBuffs[16].uPower > v6 ) - v6 = pActor->pActorBuffs[16].uPower; + if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime > 0 && pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower > v6 ) + v6 = pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower; v7 = v6 + v5; if ( a3 ) v8 = pPlayer->GetRangedAttack(); @@ -468,8 +468,8 @@ v6 /= 2; if ( (signed __int64)v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) v7 = v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower; - if ( (signed __int64)v5->pActorBuffs[16].uExpireTime > 0 && v5->pActorBuffs[16].uPower > v7 ) - v7 = v5->pActorBuffs[16].uPower; + if ( (signed __int64)v5->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime > 0 && v5->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower > v7 ) + v7 = v5->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower; v10 = v7 + v6; if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) a2a = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;