From bb9b7582ee9be01977a20a0981d18c487b03f268 Mon Sep 17 00:00:00 2001 From: treeston Date: Fri, 9 Sep 2016 18:08:43 +0200 Subject: [PATCH] Core/Maps: Add override to allow InstanceMap const* -> InstanceScript const*. Also tighten const-ness on CanSpawn method of CreatureScript. --- src/server/game/Maps/Map.h | 1 + src/server/game/Scripting/ScriptMgr.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index b8e6aecc054..a97a5f01eb1 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -766,6 +766,7 @@ class TC_GAME_API InstanceMap : public Map bool Reset(uint8 method); uint32 GetScriptId() const { return i_script_id; } InstanceScript* GetInstanceScript() { return i_data; } + InstanceScript const* GetInstanceScript() const { return i_data; } void PermBindAllPlayers(Player* source); void UnloadAll() override; EnterState CannotEnter(Player* player) override; diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index f6efe790732..9c70c6127bd 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -434,7 +434,7 @@ class TC_GAME_API CreatureScript : public UnitScript, public UpdatableScript