diff options
| -rw-r--r-- | src/game/Pet.cpp | 1 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.h | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.h | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index e723298565a..4d87a224f7e 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -576,6 +576,7 @@ void Pet::Update(uint32 diff) default: break; } + uint32 guidlow = GetGUIDLow(); Creature::Update(diff); } diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index f3f8907cfc4..59063eb05b1 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1158,7 +1158,7 @@ void SpellMgr::LoadSpellBonusess() sLog.outString( ">> Loaded %u extra spell bonus data", count); } -bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active) +bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const*& spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active) { // No extra req need uint32 procEvent_procEx = PROC_EX_NONE; diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 5c55d9b93a2..45285121c1a 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -715,7 +715,7 @@ class SpellMgr return NULL; } - static bool IsSpellProcEventCanTriggeredBy( SpellProcEventEntry const * spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active); + bool IsSpellProcEventCanTriggeredBy( SpellProcEventEntry const *& spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active); // Spell bonus data SpellBonusEntry const* GetSpellBonusData(uint32 spellId) const diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 01712ef5b49..1395288d19d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -12324,7 +12324,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co return false; // Check spellProcEvent data requirements - if(!SpellMgr::IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra, active)) + if(!spellmgr.IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra, active)) return false; // In most cases req get honor or XP from kill diff --git a/src/game/Unit.h b/src/game/Unit.h index 672886c4fb4..5076f87bd26 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1623,7 +1623,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void SendAttackStop(Unit* victim); // only from AttackStop(Unit*) //void SendAttackStart(Unit* pVictim); // only from Unit::AttackStart(Unit*) - bool IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura* aura, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, bool active, SpellProcEventEntry const*& spellProcEvent ); + bool IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura* aura, SpellEntry const * procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, bool active, SpellProcEventEntry const*& spellProcEvent ); bool HandleDummyAuraProc( Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleObsModEnergyAuraProc( Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleHasteAuraProc( Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); |