diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-07-19 23:18:19 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-07-19 23:18:19 +0200 |
| commit | 073a036d84365dae60a70064eb67e68f0447bd72 (patch) | |
| tree | b9c74a852d8135c26e3d952e26ade11155c65f29 /src/server/game/Scripting | |
| parent | 83b32667940844a257059965711284c9ab38ce44 (diff) | |
Core/Battlefields: Refactor Battlefield creation to be linked to host map creation instead of having globally accessible objects
Diffstat (limited to 'src/server/game/Scripting')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 4cf0c6c3eea..9c2821fa962 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1737,10 +1737,10 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger, b return entered ? tmpscript->OnTrigger(player, trigger) : tmpscript->OnExit(player, trigger); } -Battlefield* ScriptMgr::CreateBattlefield(uint32 scriptId) +Battlefield* ScriptMgr::CreateBattlefield(uint32 scriptId, Map* map) { GET_SCRIPT_RET(BattlefieldScript, scriptId, tmpscript, nullptr); - return tmpscript->GetBattlefield(); + return tmpscript->GetBattlefield(map); } Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index d729a0309f0..06ab3c2d0c8 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -522,7 +522,7 @@ class TC_GAME_API BattlefieldScript : public ScriptObject ~BattlefieldScript(); - virtual Battlefield* GetBattlefield() const = 0; + virtual Battlefield* GetBattlefield(Map* map) const = 0; }; class TC_GAME_API BattlegroundScript : public ScriptObject @@ -1146,7 +1146,7 @@ class TC_GAME_API ScriptMgr public: /* BattlefieldScript */ - Battlefield* CreateBattlefield(uint32 scriptId); + Battlefield* CreateBattlefield(uint32 scriptId, Map* map); public: /* BattlegroundScript */ |