# HG changeset patch # User Grumpy7 # Date 1382724644 25200 # Node ID 7fd4bfa175fd509921b782c99eecec8a574ca812 # Parent 33f3103b062b809667c7213fab734847a29bf08c pActorBuffs[2] to pActorBuffs[ACTOR_BUFF_SUMMONED] diff -r 33f3103b062b -r 7fd4bfa175fd Actor.cpp --- 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; diff -r 33f3103b062b -r 7fd4bfa175fd mm7_2.cpp --- 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,