Mercurial > mm7
changeset 1946:aa3ca49a10f5
pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
| author | Grumpy7 |
|---|---|
| date | Fri, 25 Oct 2013 11:08:34 -0700 |
| parents | 431d3da6e945 |
| children | 33f3103b062b |
| files | Actor.cpp CastSpellInfo.cpp Indoor.cpp Outdoor.cpp TurnEngine.cpp mm7_5.cpp |
| diffstat | 6 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Fri Oct 25 11:07:52 2013 -0700 +++ b/Actor.cpp Fri Oct 25 11:08:34 2013 -0700 @@ -155,7 +155,7 @@ AIState v3; // ax@6 isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned - isparalyzed = (signed __int64)this->pActorBuffs[6].uExpireTime > 0;// paralyzed + isparalyzed = (signed __int64)this->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0;// paralyzed v3 = this->uAIState; return !(isstoned || isparalyzed || v3 == Dying || v3 == Dead || v3 == Removed || v3 == Summoned || v3 == Disabled); } @@ -2058,7 +2058,7 @@ actor->uCurrentActionAnimation = ANIM_Dying; actor->sCurrentHP = 0; actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Dying]].uAnimLength; - actor->pActorBuffs[6].Reset(); + actor->pActorBuffs[ACTOR_BUFF_PARALYZED].Reset(); actor->pActorBuffs[ACTOR_BUFF_STONED].Reset(); Actor::PlaySound(uActorID, 1); actor->UpdateAnimation(); @@ -3066,7 +3066,7 @@ continue; } if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 - || (signed __int64)pActor->pActorBuffs[6].uExpireTime > 0) + || (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0) { continue; }
--- a/CastSpellInfo.cpp Fri Oct 25 11:07:52 2013 -0700 +++ b/CastSpellInfo.cpp Fri Oct 25 11:08:34 2013 -0700 @@ -848,7 +848,7 @@ Actor::AI_Stand(PID_ID(a2), 4u, 0x80u, 0); v54 = (signed __int64)((double)(23040 * v2) * 0.033333335); v55 = &pActors[PID_ID(a2)]; - v55->pActorBuffs[6].Apply(pParty->uTimePlayed + (signed int)v54, v731, 0, 0, 0); + v55->pActorBuffs[ACTOR_BUFF_PARALYZED].Apply(pParty->uTimePlayed + (signed int)v54, v731, 0, 0, 0); BYTE2(v55->uAttributes) |= 8u; v55->vVelocity.x = 0; //v672 = 0;
--- a/Indoor.cpp Fri Oct 25 11:07:52 2013 -0700 +++ b/Indoor.cpp Fri Oct 25 11:08:34 2013 -0700 @@ -4541,7 +4541,7 @@ } v8 = p->uCurrentActionTime; LABEL_12: - if (p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0i64 || p->pActorBuffs[6].uExpireTime > 0i64 ) + if (p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0i64 || p->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0i64 ) v8 = 0; v31 = p->pSpriteIDs[v5]; if (p->uAIState == Resurrected)
--- a/Outdoor.cpp Fri Oct 25 11:07:52 2013 -0700 +++ b/Outdoor.cpp Fri Oct 25 11:08:34 2013 -0700 @@ -2968,7 +2968,7 @@ } v12 = 32 * i + v11; LABEL_18: - if ( (signed __int64)actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 || (signed __int64)actor->pActorBuffs[6].uExpireTime > 0 ) + if ( (signed __int64)actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 || (signed __int64)actor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0 ) v12 = 0; v13 = actor->uAIState; if ( v13 == 17 && !v49 )
--- a/TurnEngine.cpp Fri Oct 25 11:07:52 2013 -0700 +++ b/TurnEngine.cpp Fri Oct 25 11:08:34 2013 -0700 @@ -966,7 +966,7 @@ if (PID_TYPE(pQueue[i].uPackedID) == OBJECT_Actor) { v6 = &pActors[PID_ID(pQueue[i].uPackedID)]; - if ( !(v6->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0|| (v6->pActorBuffs[6].uExpireTime > 0) || + if ( !(v6->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0|| (v6->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0) || v6->uAIState == AIState::Dead || v6->uAIState == AIState::Removed || v6->uAIState == AIState::Disabled) ) { v13 = ai_near_actors_targets_pid[PID_ID(pQueue[i].uPackedID)];
--- a/mm7_5.cpp Fri Oct 25 11:07:52 2013 -0700 +++ b/mm7_5.cpp Fri Oct 25 11:08:34 2013 -0700 @@ -159,8 +159,8 @@ else { v13 = &pActors[v7]; - if ( SHIDWORD(v13->pActorBuffs[6].uExpireTime) > 0 - || SHIDWORD(v13->pActorBuffs[6].uExpireTime) >= 0 && LODWORD(v13->pActorBuffs[6].uExpireTime) + if ( SHIDWORD(v13->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime) > 0 + || SHIDWORD(v13->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime) >= 0 && LODWORD(v13->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime) || v13->CanAct() ) { v14 = v13->vPosition.y;