Mercurial > mm7

diff Indoor.cpp @ 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 f92e0bab7c78
children aa3ca49a10f5
line wrap: on
line diff
--- 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;