diff options
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Instances/InstanceScript.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 78eb27430b6..621f2a18e28 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -48,7 +48,7 @@ BossBoundaryData::~BossBoundaryData() delete it->Boundary; } -InstanceScript::InstanceScript(Map* map) : instance(map), completedEncounters(0), +InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatResurrectionCharges(0), _combatResurrectionTimerStarted(false) { #ifdef TRINITY_API_USE_DYNAMIC_LINKING @@ -63,7 +63,7 @@ _entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatRes void InstanceScript::SaveToDB() { - if (InstanceScenario* scenario = instance->ToInstanceMap()->GetInstanceScenario()) + if (InstanceScenario* scenario = instance->GetInstanceScenario()) scenario->SaveToDB(); std::string data = GetSaveData(); diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index e566de82334..c6f900ac651 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -34,7 +34,7 @@ class AreaBoundary; class Creature; class GameObject; -class Map; +class InstanceMap; class ModuleReference; class Player; class Unit; @@ -154,11 +154,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 creation, NOT load. // PLEASE INITIALIZE FIELDS IN THE CONSTRUCTOR INSTEAD !!! |