From 22614d6bcc1a9c201d16779a93ee886facf6f7b4 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 1 Jan 2024 03:10:32 +0100 Subject: Core/Battleground: Moved DoAction hook to ZoneScript --- src/server/game/Battlegrounds/Battleground.h | 3 --- src/server/game/Maps/ZoneScript.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index e0afa255242..d712d4f46fd 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -422,9 +422,6 @@ class TC_GAME_API Battleground : public ZoneScript void EventPlayerLoggedOut(Player* player); void ProcessEvent(WorldObject* /*obj*/, uint32 /*eventId*/, WorldObject* /*invoker*/) override { } - // this function can be used by spell to interact with the BG map - virtual void DoAction(uint32 /*action*/, ObjectGuid /*var*/) { } - virtual void HandlePlayerResurrect(Player* /*player*/) { } // Death related diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h index 7ea1a9a6f57..370a2f6e239 100644 --- a/src/server/game/Maps/ZoneScript.h +++ b/src/server/game/Maps/ZoneScript.h @@ -93,6 +93,7 @@ class TC_GAME_API ZoneScript virtual void TriggerGameEvent(uint32 gameEventId, WorldObject* source = nullptr, WorldObject* target = nullptr); virtual void ProcessEvent(WorldObject* /*obj*/, uint32 /*eventId*/, WorldObject* /*invoker*/) { } + virtual void DoAction([[maybe_unused]] uint32 actionId, [[maybe_unused]] WorldObject* source = nullptr, [[maybe_unused]] WorldObject* target = nullptr) { } virtual void OnFlagStateChange([[maybe_unused]] GameObject* flagInBase, [[maybe_unused]] FlagState oldValue, [[maybe_unused]] FlagState newValue, [[maybe_unused]] Player* player) { } -- cgit v1.2.3