From 74e2d981ac1af4b0e9101c9e5e8a5bf23fd60566 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 22 Jul 2011 21:22:05 +0200 Subject: Core/GameObject: Refactored destructible building handling, properly implemented spell effect repair --- src/server/game/Scripting/ScriptMgr.cpp | 8 ++++---- src/server/game/Scripting/ScriptMgr.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 16c35efdcf4..a728478d811 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -823,20 +823,20 @@ uint32 ScriptMgr::GetDialogStatus(Player* player, GameObject* go) return tmpscript->GetDialogStatus(player, go); } -void ScriptMgr::OnGameObjectDestroyed(GameObject* go, Player* player, uint32 eventId) +void ScriptMgr::OnGameObjectDestroyed(GameObject* go, Player* player) { ASSERT(go); GET_SCRIPT(GameObjectScript, go->GetScriptId(), tmpscript); - tmpscript->OnDestroyed(go, player, eventId); + tmpscript->OnDestroyed(go, player); } -void ScriptMgr::OnGameObjectDamaged(GameObject* go, Player* player, uint32 eventId) +void ScriptMgr::OnGameObjectDamaged(GameObject* go, Player* player) { ASSERT(go); GET_SCRIPT(GameObjectScript, go->GetScriptId(), tmpscript); - tmpscript->OnDamaged(go, player, eventId); + tmpscript->OnDamaged(go, player); } void ScriptMgr::OnGameObjectUpdate(GameObject* go, uint32 diff) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index fb47282e9db..c2b62c67a7c 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -465,9 +465,9 @@ class GameObjectScript : public ScriptObject, public UpdatableScript virtual uint32 GetDialogStatus(Player* /*player*/, GameObject* /*go*/) { return 100; } // Called when the gameobject is destroyed (destructible buildings only). - virtual void OnDestroyed(GameObject* /*go*/, Player* /*player*/, uint32 /*eventId*/) { } + virtual void OnDestroyed(GameObject* /*go*/, Player* /*player*/) { } // Called when the gameobject is damaged (destructible buildings only). - virtual void OnDamaged(GameObject* /*go*/, Player* /*player*/, uint32 /*eventId*/) { } + virtual void OnDamaged(GameObject* /*go*/, Player* /*player*/) { } }; class AreaTriggerScript : public ScriptObject @@ -865,8 +865,8 @@ class ScriptMgr bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest); bool OnQuestReward(Player* player, GameObject* go, Quest const* quest, uint32 opt); uint32 GetDialogStatus(Player* player, GameObject* go); - void OnGameObjectDestroyed(GameObject* go, Player* player, uint32 eventId); - void OnGameObjectDamaged(GameObject* go, Player* player, uint32 eventId); + void OnGameObjectDestroyed(GameObject* go, Player* player); + void OnGameObjectDamaged(GameObject* go, Player* player); void OnGameObjectUpdate(GameObject* go, uint32 diff); public: /* AreaTriggerScript */ -- cgit v1.2.3