diff options
| author | QAston <none@none> | 2009-08-01 00:20:32 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-08-01 00:20:32 +0200 |
| commit | 1d96091d2a4f9a886a4d3cd80ec3c873d395dbdd (patch) | |
| tree | 88589d294e7eb5ccabf7e667970b116e6a2670a6 /src/game/Object.cpp | |
| parent | 0db1fd6c26b90241cfe039f2e2b3e35d10cb9cbd (diff) | |
*Improvements in map managing.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 53f98214703..8a9a3e09be5 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1066,7 +1066,7 @@ bool Object::PrintIndexError(uint32 index, bool set) const } WorldObject::WorldObject() - : m_mapId(0), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), + : m_phaseMask(PHASEMASK_NORMAL), m_positionX(0.0f), m_positionY(0.0f), m_positionZ(0.0f), m_orientation(0.0f), m_currMap(NULL) , m_zoneScript(NULL) , m_isActive(false), IsTempWorldObject(false) @@ -1691,11 +1691,9 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid) void WorldObject::SetMap(Map * map) { + assert (!m_currMap); ASSERT(map); m_currMap = map; - //lets save current map's Id/instanceId - m_mapId = map->GetId(); - m_InstanceId = map->GetInstanceId(); } Map const* WorldObject::GetBaseMap() const |