aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting
diff options
context:
space:
mode:
authorGolrag <golrag.jeremy@gmail.com>2015-04-18 11:11:06 +0200
committerGolrag <golrag.jeremy@gmail.com>2015-04-18 11:22:30 +0200
commitd999caee67d106add61a07df648ec5109784d37a (patch)
tree8d7f0a9c5f917cfe5288cdcebd5502bb77c25d38 /src/server/game/Scripting
parent99ef803f1d0976c03c0cd1c75126511b54d62513 (diff)
Core/AreaTrigger: Added 'bool entered' to OnTrigger
Diffstat (limited to 'src/server/game/Scripting')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp4
-rw-r--r--src/server/game/Scripting/ScriptMgr.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 1496ca988e5..16a735908da 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -951,13 +951,13 @@ bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effInd
return tmpscript->OnDummyEffect(caster, spellId, effIndex, target);
}
-bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger)
+bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered)
{
ASSERT(player);
ASSERT(trigger);
GET_SCRIPT_RET(AreaTriggerScript, sObjectMgr->GetAreaTriggerScriptId(trigger->ID), tmpscript, false);
- return tmpscript->OnTrigger(player, trigger);
+ return tmpscript->OnTrigger(player, trigger, entered);
}
Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/)
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 2ac42dd1a63..588d909ae94 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -513,7 +513,7 @@ class AreaTriggerScript : public ScriptObject
bool IsDatabaseBound() const final override { return true; }
// Called when the area trigger is activated by a player.
- virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) { return false; }
+ virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/, bool /*entered*/) { return false; }
};
class BattlegroundScript : public ScriptObject
@@ -1001,7 +1001,7 @@ class ScriptMgr
public: /* AreaTriggerScript */
- bool OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger);
+ bool OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered);
public: /* BattlegroundScript */