diff options
| author | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
| commit | bd054b84533305420e368fae85921e43c2382c78 (patch) | |
| tree | 3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/Map.cpp | |
| parent | e6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff) | |
| parent | 560ca5a2102a082f6712e1a3ec58f9f367532ade (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 4a102b92051..344fcbc74a2 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -127,7 +127,7 @@ void Map::LoadMap(int gx,int gy, bool reload) if(GridMaps[gx][gy]) return; - Map* baseMap = const_cast<Map*>(MapManager::Instance().GetBaseMap(i_id)); + Map* baseMap = const_cast<Map*>(MapManager::Instance().CreateBaseMap(i_id)); // load grid map for base map if (!baseMap->GridMaps[gx][gy]) @@ -498,9 +498,6 @@ void Map::Add(T *obj) { CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()); - - assert(obj); - if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { sLog.outError("Map::Add: Object " UI64FMTD " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); @@ -1161,7 +1158,7 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll) VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gy, gx); } else - ((MapInstanced*)(MapManager::Instance().GetBaseMap(i_id)))->RemoveGridMapReference(GridPair(gx, gy)); + ((MapInstanced*)(MapManager::Instance().CreateBaseMap(i_id)))->RemoveGridMapReference(GridPair(gx, gy)); GridMaps[gx][gy] = NULL; } DEBUG_LOG("Unloading grid[%u,%u] for map %u finished", x,y, i_id); |