From 590199d8e17405a0717eaf2e2d39f0d671b6f844 Mon Sep 17 00:00:00 2001 From: azazel Date: Sun, 8 Aug 2010 22:54:58 +0600 Subject: * Rename InstanceData to InstanceScript * Rename *mgr to their new names in scripts project * Mass convert all the scripts (NEEDS THOROUGH TESTING, because it was done automatically) Please, report bugs on issue tracker. --HG-- branch : trunk rename : src/server/game/Instances/InstanceData.cpp => src/server/game/Instances/InstanceScript.cpp rename : src/server/game/Instances/InstanceData.h => src/server/game/Instances/InstanceScript.h --- src/server/game/Entities/Object/Object.cpp | 6 +++--- src/server/game/Entities/Object/Object.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game/Entities/Object') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 477f06ba21b..5901ad7caa1 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1251,10 +1251,10 @@ void WorldObject::GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const GetBaseMap()->GetZoneAndAreaId(zoneid, areaid, m_positionX, m_positionY, m_positionZ); } -InstanceData* WorldObject::GetInstanceData() +InstanceScript* WorldObject::GetInstanceScript() { Map *map = GetMap(); - return map->IsDungeon() ? ((InstanceMap*)map)->GetInstanceData() : NULL; + return map->IsDungeon() ? ((InstanceMap*)map)->GetInstanceScript() : NULL; } float WorldObject::GetDistanceZ(const WorldObject* obj) const @@ -1844,7 +1844,7 @@ void WorldObject::SetZoneScript() if (Map *map = FindMap()) { if (map->IsDungeon()) - m_zoneScript = (ZoneScript*)((InstanceMap*)map)->GetInstanceData(); + m_zoneScript = (ZoneScript*)((InstanceMap*)map)->GetInstanceScript(); else if (!map->IsBattlegroundOrArena()) m_zoneScript = sOutdoorPvPMgr.GetZoneScript(GetZoneId()); } diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index af501823d4a..d148787aa28 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -108,7 +108,7 @@ class WorldSession; class Creature; class Player; class UpdateMask; -class InstanceData; +class InstanceScript; class GameObject; class TempSummon; class Vehicle; @@ -599,7 +599,7 @@ class WorldObject : public Object, public WorldLocation uint32 GetAreaId() const; void GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const; - InstanceData* GetInstanceData(); + InstanceScript* GetInstanceScript(); const char* GetName() const { return m_name.c_str(); } void SetName(const std::string& newname) { m_name=newname; } -- cgit v1.2.3