Mercurial > mm7
changeset 1956:542c13cd72e2
pActorBuffs[12] to pActorBuffs[ACTOR_BUFF_ENSLAVED]
| author | Grumpy7 |
|---|---|
| date | Fri, 25 Oct 2013 11:17:25 -0700 |
| parents | 0c5326e2044a |
| children | 3d0c57c4fa83 |
| files | Actor.cpp CastSpellInfo.cpp |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Fri Oct 25 11:16:52 2013 -0700 +++ b/Actor.cpp Fri Oct 25 11:17:25 2013 -0700 @@ -2466,7 +2466,7 @@ if (can_target_party && !pParty->Invisible()) { if ( thisActor->uAttributes & 0x80000 - && thisActor->pActorBuffs[12].uExpireTime <= 0 + && thisActor->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime <= 0 && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0 && thisActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime <= 0 ) v14 = 4;
--- a/CastSpellInfo.cpp Fri Oct 25 11:16:52 2013 -0700 +++ b/CastSpellInfo.cpp Fri Oct 25 11:17:25 2013 -0700 @@ -913,8 +913,8 @@ //((SpellBuff *)((char *)&pActors[0].pActorBuffs[ACTOR_BUFF_BERSERK] + v730))->Reset(); pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_BERSERK].Reset(); - //((SpellBuff *)((char *)&pActors[0].pActorBuffs[12] + v730))->Reset(); - pActors[PID_ID(a2)].pActorBuffs[12].Reset(); + //((SpellBuff *)((char *)&pActors[0].pActorBuffs[ACTOR_BUFF_ENSLAVED] + v730))->Reset(); + pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_ENSLAVED].Reset(); //((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); @@ -2769,7 +2769,7 @@ if ( stru_50C198.GetMagicalResistance(&pActors[v426], 7u) ) { pActors[v426].pActorBuffs[ACTOR_BUFF_CHARM].Reset(); - pActors[v426].pActorBuffs[12].Reset(); + pActors[v426].pActorBuffs[ACTOR_BUFF_ENSLAVED].Reset(); pActors[v426].pActorBuffs[ACTOR_BUFF_BERSERK].Apply( pParty->uTimePlayed + (signed __int64)((double)(amount << 7) * 0.033333335), v731, 0, 0, 0); @@ -2822,7 +2822,7 @@ { pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_BERSERK].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), + pActors[PID_ID(a2)].pActorBuffs[ACTOR_BUFF_ENSLAVED].Apply(pParty->uTimePlayed + (signed __int64)((double)(amount << 7) * 0.033333335), v731, 0, 0, 0); } pSpellSprite.stru_24.Reset(); @@ -3760,7 +3760,7 @@ } pActor->pActorBuffs[ACTOR_BUFF_BERSERK].Reset(); pActor->pActorBuffs[ACTOR_BUFF_CHARM].Reset(); - pActor->pActorBuffs[12].Apply(pParty->uTimePlayed + (signed __int64)((double)(signed int)((int)v733 << 7) * 0.033333335), + pActor->pActorBuffs[ACTOR_BUFF_ENSLAVED].Apply(pParty->uTimePlayed + (signed __int64)((double)(signed int)((int)v733 << 7) * 0.033333335), v731, 0, 0, 0); pSpellSprite.stru_24.Reset(); pSpellSprite.spell_id = pCastSpell->uSpellID;