diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-09-09 18:08:43 +0200 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-09-09 18:08:43 +0200 |
| commit | 3c32086b81ea85ddbb5920c11d9f30fbd0953ef6 (patch) | |
| tree | 2fc1951edf4b03acd3d6a2719e2d4623c927f966 /src | |
| parent | 62cffd11d0e9b33dd60cb5238f06d6dfd06415d8 (diff) | |
Core/Maps: Add override to allow InstanceMap const* -> InstanceScript const*.
Also tighten const-ness on CanSpawn method of CreatureScript.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Maps/Map.h | 1 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 48864180b84..db71b6f01fa 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -768,6 +768,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 d0f9ad32f1c..5101e2d8967 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -435,7 +435,7 @@ class TC_GAME_API CreatureScript : public UnitScript, public UpdatableScript<Cre virtual uint32 GetDialogStatus(Player* /*player*/, Creature* /*creature*/) { return DIALOG_STATUS_SCRIPTED_NO_STATUS; } // Called when the creature tries to spawn. Return false to block spawn and re-evaluate on next tick. - virtual bool CanSpawn(ObjectGuid::LowType /*spawnId*/, CreatureTemplate const* /*cTemplate*/, CreatureData const* /*cData*/, Map const* /*map*/) { return true; } + virtual bool CanSpawn(ObjectGuid::LowType /*spawnId*/, CreatureTemplate const* /*cTemplate*/, CreatureData const* /*cData*/, Map const* /*map*/) const { return true; } // Called when a CreatureAI object is needed for the creature. virtual CreatureAI* GetAI(Creature* /*creature*/) const { return NULL; } |