Mercurial > mm7

changeset 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
files Actor.cpp CastSpellInfo.cpp
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
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
--- a/CastSpellInfo.cpp	Fri Oct 25 11:08:34 2013 -0700
+++ b/CastSpellInfo.cpp	Fri Oct 25 11:09:52 2013 -0700
@@ -915,8 +915,8 @@
 		pActors[PID_ID(a2)].pActorBuffs[9].Reset();
 		//((SpellBuff *)((char *)&pActors[0].pActorBuffs[12] + v730))->Reset();
 		pActors[PID_ID(a2)].pActorBuffs[12].Reset();
-		//((SpellBuff *)((char *)&pActors[0].pActorBuffs[1] + v730))->Apply(
-		pActors[PID_ID(a2)].pActorBuffs[1].Apply(pParty->uTimePlayed + (signed int)(signed __int64)((double)(signed int)(power << 7) * 0.033333335),
+		//((SpellBuff *)((char *)&pActors[0].pActorBuffs[ACTOR_BUFF_CHARM] + v730))->Apply(
+		pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_CHARM].Apply(pParty->uTimePlayed + (signed int)(signed __int64)((double)(signed int)(power << 7) * 0.033333335),
 			v731, 0, 0, 0);
 		pSpellSprite.stru_24.Reset();
 		pSpellSprite.spell_id = pCastSpell->uSpellID;
@@ -2768,7 +2768,7 @@
 			v730 = 836 * v426;
 			if ( stru_50C198.GetMagicalResistance(&pActors[v426], 7u) )
 			{
-				pActors[v426].pActorBuffs[1].Reset();
+				pActors[v426].pActorBuffs[ACTOR_BUFF_CHARM].Reset();
 				pActors[v426].pActorBuffs[12].Reset();
 				pActors[v426].pActorBuffs[9].Apply(
 				pParty->uTimePlayed + (signed __int64)((double)(amount << 7) * 0.033333335),
@@ -2821,7 +2821,7 @@
 			if ( stru_50C198.GetMagicalResistance(&pActors[PID_ID(a2)], 7u) )
 			{
 				pActors[PID_ID(a2)].pActorBuffs[9].Reset();
-				pActors[PID_ID(a2)].pActorBuffs[1].Reset();
+				pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_CHARM].Reset();
 				pActors[PID_ID(a2)].pActorBuffs[12].Apply(pParty->uTimePlayed + (signed __int64)((double)(amount << 7) * 0.033333335),
 				v731, 0, 0, 0);
 			}
@@ -3759,7 +3759,7 @@
 				continue;
 			}
 			pActor->pActorBuffs[9].Reset();
-			pActor->pActorBuffs[1].Reset();
+			pActor->pActorBuffs[ACTOR_BUFF_CHARM].Reset();
 			pActor->pActorBuffs[12].Apply(pParty->uTimePlayed + (signed __int64)((double)(signed int)((int)v733 << 7) * 0.033333335),
 				v731, 0, 0, 0);
 			pSpellSprite.stru_24.Reset();