Mercurial > mm7

diff Actor.cpp @ 1946:aa3ca49a10f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
author Grumpy7
date Fri, 25 Oct 2013 11:08:34 -0700
parents 431d3da6e945
children 33f3103b062b
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;
 		}