Core/Auras: Fixed crash in AuraEffect::TriggerSpell (dummy effect) and removed some useless code

Scripts/AI: Changed sOnDummyEffect to return bool value

Closes issue #5190.

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-12-18 22:04:19 +01:00
parent 8ce0abbbc8
commit 24193966dd
4 changed files with 13 additions and 22 deletions
+1 -1
View File
@@ -219,7 +219,7 @@ class UnitAI
virtual void sQuestSelect(Player* /*player*/, Quest const* /*quest*/) {}
virtual void sQuestComplete(Player* /*player*/, Quest const* /*quest*/) {}
virtual void sQuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) {}
virtual void sOnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/) {}
virtual bool sOnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/) { return false; }
};
class PlayerAI : public UnitAI
+2 -1
View File
@@ -746,9 +746,10 @@ void SmartAI::sQuestReward(Player* player, Quest const* quest, uint32 opt)
GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt);
}
void SmartAI::sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex)
bool SmartAI::sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex)
{
GetScript()->ProcessEventsFor(SMART_EVENT_DUMMY_EFFECT,caster,spellId,(uint32)effIndex);
return true;
}
void SmartAI::SetCombatMove(bool on)
+1 -1
View File
@@ -182,7 +182,7 @@ class SmartAI : public CreatureAI
//void sQuestSelect(Player* player, Quest const* quest);
//void sQuestComplete(Player* player, Quest const* quest);
void sQuestReward(Player* player, Quest const* quest, uint32 opt);
void sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex);
bool sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex);
uint32 mEscortQuestID;