aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKittnz <frederik156@hotmail.com>2017-02-17 20:30:52 +0100
committerKittnz <frederik156@hotmail.com>2017-02-17 20:30:52 +0100
commit9d74252e8d728a4e7ab6359a85d982b29672c5cd (patch)
tree5d932a09068e640a45acb979d52102354a353b41 /src
parenta5ccbe9906ead6b50644ad55f435c8d78eedb326 (diff)
Reverting: Game/Scripting: Add OnGameEvent hook for game objects.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Events/GameEventMgr.cpp6
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp5
-rw-r--r--src/server/game/Scripting/ScriptMgr.h4
3 files changed, 0 insertions, 15 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index b7175ff577b..0d59f6731af 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -28,7 +28,6 @@
#include "BattlegroundMgr.h"
#include "UnitAI.h"
#include "GameObjectAI.h"
-#include "ScriptMgr.h"
GameEventMgr* GameEventMgr::instance()
{
@@ -1642,13 +1641,8 @@ public:
void Visit(std::unordered_map<ObjectGuid, GameObject*>& gameObjectMap)
{
for (auto const& p : gameObjectMap)
- {
if (p.second->IsInWorld())
- {
p.second->AI()->OnGameEvent(_activate, _eventId);
- sScriptMgr->OnGameEvent(_activate, _eventId);
- }
- }
}
template<class T>
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index fb4d78bf300..f04f288a828 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1776,11 +1776,6 @@ void ScriptMgr::OnGameObjectUpdate(GameObject* go, uint32 diff)
tmpscript->OnUpdate(go, diff);
}
-void ScriptMgr::OnGameEvent(bool start, uint16 eventId)
-{
- FOREACH_SCRIPT(GameObjectScript)->OnGameEvent(start, eventId);
-}
-
bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, GameObject* target)
{
ASSERT(caster);
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index d4b711ffd3b..c47c75f3a9a 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -485,9 +485,6 @@ class TC_GAME_API GameObjectScript : public ScriptObject, public UpdatableScript
// Called when a GameObjectAI object is needed for the gameobject.
virtual GameObjectAI* GetAI(GameObject* /*go*/) const { return NULL; }
-
- // Called when specific game event starts.
- virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) { }
};
class TC_GAME_API AreaTriggerScript : public ScriptObject
@@ -988,7 +985,6 @@ class TC_GAME_API ScriptMgr
void OnGameObjectStateChanged(GameObject* go, uint32 state);
void OnGameObjectUpdate(GameObject* go, uint32 diff);
GameObjectAI* GetGameObjectAI(GameObject* go);
- void OnGameEvent(bool start, uint16 eventId);
public: /* AreaTriggerScript */