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/MapManager.cpp | |
parent | 0db1fd6c26b90241cfe039f2e2b3e35d10cb9cbd (diff) |
*Improvements in map managing.
--HG--
branch : trunk
Diffstat (limited to 'src/game/MapManager.cpp')
-rw-r--r-- | src/game/MapManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index 79a81f2afa3..1645419fd4d 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -128,13 +128,13 @@ MapManager::_createBaseMap(uint32 id) return m; } -Map* MapManager::CreateMap(uint32 id, const WorldObject* obj) +Map* MapManager::CreateMap(uint32 id, const WorldObject* obj, uint32 instanceId) { ASSERT(obj); //if(!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId()); Map *m = _createBaseMap(id); - if (m && (obj->GetTypeId() == TYPEID_PLAYER) && m->Instanceable()) m = ((MapInstanced*)m)->CreateInstance(id, (Player*)obj); + if (m && (obj->GetTypeId() == TYPEID_PLAYER) && m->Instanceable()) m = ((MapInstanced*)m)->CreateInstance(id, (Player*)obj, instanceId); return m; } |