*Fix some problems with ProcFlag

--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-13 15:52:59 +02:00
parent cbc6269b47
commit beab3e0125
5 changed files with 5 additions and 4 deletions
+1
View File
@@ -576,6 +576,7 @@ void Pet::Update(uint32 diff)
default: default:
break; break;
} }
uint32 guidlow = GetGUIDLow();
Creature::Update(diff); Creature::Update(diff);
} }
+1 -1
View File
@@ -1158,7 +1158,7 @@ void SpellMgr::LoadSpellBonusess()
sLog.outString( ">> Loaded %u extra spell bonus data", count); 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 // No extra req need
uint32 procEvent_procEx = PROC_EX_NONE; uint32 procEvent_procEx = PROC_EX_NONE;
+1 -1
View File
@@ -715,7 +715,7 @@ class SpellMgr
return NULL; 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 // Spell bonus data
SpellBonusEntry const* GetSpellBonusData(uint32 spellId) const SpellBonusEntry const* GetSpellBonusData(uint32 spellId) const
+1 -1
View File
@@ -12324,7 +12324,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
return false; return false;
// Check spellProcEvent data requirements // Check spellProcEvent data requirements
if(!SpellMgr::IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra, active)) if(!spellmgr.IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra, active))
return false; return false;
// In most cases req get honor or XP from kill // In most cases req get honor or XP from kill