diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-08-24 14:38:16 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-08-24 14:38:55 +0200 |
| commit | c20f92c08c2da751fd4c45d351650a8d722f0b91 (patch) | |
| tree | a035fec6a1c9923b7b2f656946754e91ecdcb290 /src/server/game/AI | |
| parent | 01a694886ed4688adf89457c8f2116379f15cc40 (diff) | |
| parent | 9beae1dc97dbe534c7dbb84c0546bf97c9f8461b (diff) | |
Merge branch 'Rochet2/questreward'
Close pull request #12657
Diffstat (limited to 'src/server/game/AI')
| -rw-r--r-- | src/server/game/AI/CoreAI/UnitAI.h | 1 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index b6743b572cb..979fe4fe558 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -258,7 +258,6 @@ class UnitAI virtual void sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { } virtual void sQuestAccept(Player* /*player*/, Quest const* /*quest*/) { } 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 bool sOnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/) { return false; } virtual void sOnGameEvent(bool /*start*/, uint16 /*eventId*/) { } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index e674bbfdaac..b0d5d4f8343 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -178,8 +178,7 @@ class SmartAI : public CreatureAI void sGossipSelect(Player* player, uint32 sender, uint32 action) override; void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code) override; void sQuestAccept(Player* player, Quest const* quest) override; - //void sQuestSelect(Player* player, Quest const* quest); - //void sQuestComplete(Player* player, Quest const* quest); + //void sQuestSelect(Player* player, Quest const* quest) override; void sQuestReward(Player* player, Quest const* quest, uint32 opt) override; bool sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex) override; void sOnGameEvent(bool start, uint16 eventId) override; |