diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-18 11:32:53 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-04-18 11:32:53 +0200 |
| commit | 41e2b0046dc73ab2adf9c15442d70a7b769013f9 (patch) | |
| tree | 1f2ecf764146557eccab9f0dca570bb8cfefc36d /src/server/scripts/Events | |
| parent | 5a1ab5d871b9abd87d62c770c89e1ef5b6126f72 (diff) | |
| parent | d999caee67d106add61a07df648ec5109784d37a (diff) | |
Merge pull request #14568 from Golrag/AreaTrigger1
Core/AreaTrigger: Added 'bool entered' to OnTrigger
Diffstat (limited to 'src/server/scripts/Events')
| -rw-r--r-- | src/server/scripts/Events/childrens_week.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index dd2f860c66c..dab0ad5b95a 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -920,7 +920,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript public: at_bring_your_orphan_to() : AreaTriggerScript("at_bring_your_orphan_to") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override + bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override { if (player->isDead() || !player->HasAura(SPELL_ORPHAN_OUT)) return false; @@ -928,7 +928,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript uint32 questId = 0; uint32 orphanId = 0; - switch (trigger->ID) + switch (areaTrigger->ID) { case AT_DOWN_AT_THE_DOCKS: questId = QUEST_DOWN_AT_THE_DOCKS; |