diff options
| author | Ovah <dreadkiller@gmx.de> | 2020-11-17 19:45:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 19:45:13 +0100 |
| commit | 850b88546ff958d751bf4c1962731610ddc95617 (patch) | |
| tree | 18a74eb01e32de166d66d0a749254dda782e3ef4 /src/server/game | |
| parent | e6b945eabcdeded8043e40b4e5ede41bd26701dd (diff) | |
Scripts/Misc: Use InstanceMap* in InstanceScript instead of Map* (#25655)
# Conflicts:
# src/server/game/Instances/InstanceScript.cpp
# src/server/game/Instances/InstanceScript.h
# src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
# src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
# src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
# src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
# src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
# src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
# src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Instances/InstanceScript.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 44ea37c2361..695bd33a52c 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -45,7 +45,7 @@ BossBoundaryData::~BossBoundaryData() delete it->Boundary; } -InstanceScript::InstanceScript(Map* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetSpawnGroupsForInstance(map->GetId())) +InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetSpawnGroupsForInstance(map->GetId())) { #ifdef TRINITY_API_USE_DYNAMIC_LINKING uint32 scriptId = sObjectMgr->GetInstanceTemplate(map->GetId())->ScriptId; diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 5b6846ec562..bd93498877a 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -42,8 +42,8 @@ namespace WorldPackets class AreaBoundary; class Creature; class GameObject; +class InstanceMap; struct InstanceSpawnGroupInfo; -class Map; class ModuleReference; class Player; class Unit; @@ -155,11 +155,11 @@ typedef std::map<uint32 /*entry*/, uint32 /*type*/> ObjectInfoMap; class TC_GAME_API InstanceScript : public ZoneScript { public: - explicit InstanceScript(Map* map); + explicit InstanceScript(InstanceMap* map); virtual ~InstanceScript() { } - Map* instance; + InstanceMap* instance; // On instance load, exactly ONE of these methods will ALWAYS be called: // if we're starting without any saved instance data |