Mercurial > mm7

changeset 1945:431d3da6e945

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
author Grumpy7
date Fri, 25 Oct 2013 11:07:52 -0700
parents 02bc0fac639f
children aa3ca49a10f5
files Actor.cpp Indoor.cpp Outdoor.cpp TurnEngine.cpp mm7_5.cpp
diffstat 5 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 00:51:32 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:07:52 2013 -0700
@@ -154,7 +154,7 @@
   bool isstoned; // edi@2
   AIState v3; // ax@6
 
-  isstoned = (signed __int64)this->pActorBuffs[5].uExpireTime > 0;// stoned
+  isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned
   isparalyzed = (signed __int64)this->pActorBuffs[6].uExpireTime > 0;// paralyzed
   v3 = this->uAIState;
   return !(isstoned || isparalyzed || v3 == Dying || v3 == Dead || v3 == Removed || v3 == Summoned || v3 == Disabled);
@@ -165,7 +165,7 @@
 {
   bool isstoned; // esi@1
 
-  isstoned = (signed __int64)this->pActorBuffs[5].uExpireTime > 0;// stoned
+  isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned
   return (isstoned || (uAIState == Dying) || (uAIState == Dead) || (uAIState == Removed) || (uAIState == Summoned) || (uAIState == Disabled));
 }
 
@@ -2059,7 +2059,7 @@
   actor->sCurrentHP = 0;
   actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Dying]].uAnimLength;
   actor->pActorBuffs[6].Reset();
-  actor->pActorBuffs[5].Reset();
+  actor->pActorBuffs[ACTOR_BUFF_STONED].Reset();
   Actor::PlaySound(uActorID, 1);
   actor->UpdateAnimation();
 
@@ -3065,7 +3065,7 @@
 			pActor->uAIState = Removed;
 			continue;
 		}
-		if ( (signed __int64)pActor->pActorBuffs[5].uExpireTime > 0
+		if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0
 			|| (signed __int64)pActor->pActorBuffs[6].uExpireTime > 0)
 		{
 			continue;
--- a/Indoor.cpp	Fri Oct 25 00:51:32 2013 -0700
+++ b/Indoor.cpp	Fri Oct 25 11:07:52 2013 -0700
@@ -4541,7 +4541,7 @@
     }
     v8 = p->uCurrentActionTime;
 LABEL_12:
-    if (p->pActorBuffs[5].uExpireTime > 0i64 || p->pActorBuffs[6].uExpireTime > 0i64 )
+    if (p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0i64 || p->pActorBuffs[6].uExpireTime > 0i64 )
       v8 = 0;
     v31 = p->pSpriteIDs[v5];
     if (p->uAIState == Resurrected)
@@ -4656,12 +4656,12 @@
     v0->actual_z = HIWORD(x);
     v0->object_pid = PID(OBJECT_Actor,i);
 
-    v29 = HIDWORD(p->pActorBuffs[5].uExpireTime) == 0;
-    v30 = HIDWORD(p->pActorBuffs[5].uExpireTime) < 0;
+    v29 = HIDWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) == 0;
+    v30 = HIDWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) < 0;
     v0->field_1E = v41;
     v0->pSpriteFrame = v10;
     v0->uTintColor = pMonsterList->pMonsters[p->pMonsterInfo.uID - 1].uTintColor;
-    if ( !v30 && (!(v30 | v29) || LODWORD(p->pActorBuffs[5].uExpireTime)) )
+    if ( !v30 && (!(v30 | v29) || LODWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime)) )
     {
       HIBYTE(v26) = HIBYTE(v41) | 1;
       v0->field_1E = v26;
--- a/Outdoor.cpp	Fri Oct 25 00:51:32 2013 -0700
+++ b/Outdoor.cpp	Fri Oct 25 11:07:52 2013 -0700
@@ -2968,7 +2968,7 @@
       }
       v12 = 32 * i + v11;
 LABEL_18:
-      if ( (signed __int64)actor->pActorBuffs[5].uExpireTime > 0 || (signed __int64)actor->pActorBuffs[6].uExpireTime > 0 )
+      if ( (signed __int64)actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 || (signed __int64)actor->pActorBuffs[6].uExpireTime > 0 )
         v12 = 0;
 	  v13 = actor->uAIState;
       if ( v13 == 17 && !v49 )
--- a/TurnEngine.cpp	Fri Oct 25 00:51:32 2013 -0700
+++ b/TurnEngine.cpp	Fri Oct 25 11:07:52 2013 -0700
@@ -966,7 +966,7 @@
         if (PID_TYPE(pQueue[i].uPackedID) == OBJECT_Actor)
             {
             v6 = &pActors[PID_ID(pQueue[i].uPackedID)];
-            if ( !(v6->pActorBuffs[5].uExpireTime > 0|| (v6->pActorBuffs[6].uExpireTime > 0) || 
+            if ( !(v6->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0|| (v6->pActorBuffs[6].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 00:51:32 2013 -0700
+++ b/mm7_5.cpp	Fri Oct 25 11:07:52 2013 -0700
@@ -450,9 +450,9 @@
           if ( v11 )
             v10 = (signed int)v10 / (unsigned __int16)v11;
         }
-        if ( SHIDWORD(v7->pActorBuffs[5].uExpireTime) >= SHIDWORD(v10)
-          && (SHIDWORD(v7->pActorBuffs[5].uExpireTime) > SHIDWORD(v10)
-           || LODWORD(v7->pActorBuffs[5].uExpireTime) > HIDWORD(v10)) )
+        if ( SHIDWORD(v7->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) >= SHIDWORD(v10)
+          && (SHIDWORD(v7->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) > SHIDWORD(v10)
+           || LODWORD(v7->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) > HIDWORD(v10)) )
           LODWORD(v10) = 0;
         if ( a4 != HIDWORD(v10) )
         {