Mercurial > mm7

changeset 1950:8509a59af88f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
author Grumpy7
date Fri, 25 Oct 2013 11:12:18 -0700
parents 2f45768fcb7a
children 524fe0810f32
files Actor.cpp CastSpellInfo.cpp TurnEngine.cpp
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:11:31 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:12:18 2013 -0700
@@ -1975,8 +1975,8 @@
   }
   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 ( v4->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0 )
+    v4->pActorBuffs[ACTOR_BUFF_AFRAID].Reset();
   if ( stunRegardlessOfState
     || (v4->uAIState != Stunned
     && v4->uAIState != AttackingRanged1
@@ -3159,7 +3159,7 @@
 				pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
 		}
 
-		if (pActor->pActorBuffs[4].uExpireTime > 0)
+		if (pActor->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0)
 		{
 			if ( (signed int)v36 >= 10240 )
 			{
--- a/CastSpellInfo.cpp	Fri Oct 25 11:11:31 2013 -0700
+++ b/CastSpellInfo.cpp	Fri Oct 25 11:12:18 2013 -0700
@@ -2419,7 +2419,7 @@
 
 					pSpellSprite.spell_target_pid = PID(OBJECT_Actor, dword_50BF30[a2]);
 					pSpellSprite.Create(0, 0, 0, 0);
-					v369->pActorBuffs[4].Apply(
+					v369->pActorBuffs[ACTOR_BUFF_AFRAID].Apply(
 						pParty->uTimePlayed + (signed __int64)((double)(signed int)((int)v733 << 7) * 0.033333335),
 						v731, 0, 0, 0);
 				}
@@ -2891,7 +2891,7 @@
 				pSpellSprite.Create(0, 0, 0, 0);
 				if ( stru_50C198.GetMagicalResistance(v433, 7u) )
 				{
-					v433->pActorBuffs[4].Apply(pParty->uTimePlayed + (signed __int64)((double)(amount << 7) * 0.033333335),
+					v433->pActorBuffs[ACTOR_BUFF_AFRAID].Apply(pParty->uTimePlayed + (signed __int64)((double)(amount << 7) * 0.033333335),
 						v731, 0, 0, 0);
 				}
 			}
--- a/TurnEngine.cpp	Fri Oct 25 11:11:31 2013 -0700
+++ b/TurnEngine.cpp	Fri Oct 25 11:12:18 2013 -0700
@@ -1061,7 +1061,7 @@
         break;
         }
 
-    if ( actor->pActorBuffs[4].uExpireTime > 0 )
+    if ( actor->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0 )
         {
         if (v11 < 10240 )
             {