diff options
| author | Blaymoira <none@none> | 2008-12-12 20:34:51 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2008-12-12 20:34:51 +0100 |
| commit | ab59d3adcc2a4afc743afe1a998290b99ed95929 (patch) | |
| tree | 198a3ddb3aba4e7505869bcb0d631d5a289b817f /src/game/Map.cpp | |
| parent | ec12b76b392d65f02ad1b2d48508771f77284b50 (diff) | |
| parent | b6c288ca9fb271923f493ee39d78b5dc4b2a996f (diff) | |
*Merged with 464.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 6e12597f4dd..f3c4adbd805 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -810,7 +810,7 @@ Map::Remove(T *obj, bool remove) CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()); if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { - sLog.outError("Map::Remove: Object " I64FMTD " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); + sLog.outError("Map::Remove: Object " I64FMT " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); return; } @@ -818,7 +818,7 @@ Map::Remove(T *obj, bool remove) if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) return; - DEBUG_LOG("Remove object " I64FMTD " from grid[%u,%u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y); + DEBUG_LOG("Remove object " I64FMT " from grid[%u,%u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y); NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); assert( grid != NULL ); @@ -1092,7 +1092,7 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool pForce) if (i_InstanceId == 0) { if(GridMaps[gx][gy]) delete (GridMaps[gx][gy]); - // x and y are swaped + // x and y are swapped VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gy, gx); } else @@ -1259,7 +1259,6 @@ uint8 Map::GetTerrainType(float x, float y ) const return GridMaps[gx][gy]->terrain_type[(int)(lx)][(int)(ly)]; else return 0; - } float Map::GetWaterLevel(float x, float y ) const |