Mercurial > mm7

diff Actor.cpp @ 1947:33f3103b062b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
author Grumpy7
date Fri, 25 Oct 2013 11:09:52 -0700
parents aa3ca49a10f5
children 7fd4bfa175fd
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:08:34 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:09:52 2013 -0700
@@ -1973,8 +1973,8 @@
     v4->uAttributes &= 0xFFFFFFFBu;
     v4->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
   }
-  if ( v4->pActorBuffs[1].uExpireTime > 0 )
-    v4->pActorBuffs[1].Reset();
+  if ( v4->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 )
+    v4->pActorBuffs[ACTOR_BUFF_CHARM].Reset();
   if ( v4->pActorBuffs[4].uExpireTime > 0 )
     v4->pActorBuffs[4].Reset();
   if ( stunRegardlessOfState
@@ -2467,7 +2467,7 @@
   {
     if ( thisActor->uAttributes & 0x80000
       && thisActor->pActorBuffs[12].uExpireTime <= 0
-      && thisActor->pActorBuffs[1].uExpireTime <= 0
+      && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0
       && thisActor->pActorBuffs[2].uExpireTime <= 0 )
       v14 = 4;
     else