Mercurial > mm7

changeset 1948:7fd4bfa175fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[2] to pActorBuffs[ACTOR_BUFF_SUMMONED]
author Grumpy7
date Fri, 25 Oct 2013 11:10:44 -0700
parents 33f3103b062b
children 2f45768fcb7a
files Actor.cpp mm7_2.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Oct 25 11:09:52 2013 -0700
+++ b/Actor.cpp	Fri Oct 25 11:10:44 2013 -0700
@@ -2468,7 +2468,7 @@
     if ( thisActor->uAttributes & 0x80000
       && thisActor->pActorBuffs[12].uExpireTime <= 0
       && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0
-      && thisActor->pActorBuffs[2].uExpireTime <= 0 )
+      && thisActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime <= 0 )
       v14 = 4;
     else
       v14 = thisActor->GetActorsRelation(0);
@@ -3060,7 +3060,7 @@
 		// not sure
 		else if ( pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0 )
 			pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
-		if ( pActor->pActorBuffs[2].uExpireTime < 0 )
+		if ( pActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime < 0 )
 		{
 			pActor->uAIState = Removed;
 			continue;
--- a/mm7_2.cpp	Fri Oct 25 11:09:52 2013 -0700
+++ b/mm7_2.cpp	Fri Oct 25 11:10:44 2013 -0700
@@ -1409,7 +1409,7 @@
       if ( v20 == uNumActors )
         ++uNumActors;
       v6->uSummonerID = PID(OBJECT_Player, a1);
-      result = v6->pActorBuffs[2].Apply(pParty->uTimePlayed + (a3 * 128) / 30.0f,
+      result = v6->pActorBuffs[ACTOR_BUFF_SUMMONED].Apply(pParty->uTimePlayed + (a3 * 128) / 30.0f,
                  a2,
                  a1,
                  0,