diff options
| -rw-r--r-- | src/game/Map.cpp | 14 | ||||
| -rw-r--r-- | src/game/MapManager.cpp | 5 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index cd8e2d9c152..97fecfc5cca 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -234,7 +234,7 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par void Map::InitVisibilityDistance() { //init visibility for continents - m_VisibleDistance = sWorld.GetMaxVisibleDistanceOnContinents(); + m_VisibleDistance = World::GetMaxVisibleDistanceOnContinents(); } // Template specialization of utility methods @@ -2396,8 +2396,8 @@ bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const Player* plr = iter->getSource(); CellPair p = Trinity::ComputeCellPair(plr->GetPositionX(), plr->GetPositionY()); - if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) && - (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord) ) + if ((cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) && + (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord)) return true; } @@ -2406,8 +2406,8 @@ bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const WorldObject* obj = *iter; CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()); - if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) && - (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord) ) + if ((cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) && + (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord)) return true; } @@ -2493,7 +2493,7 @@ InstanceMap::~InstanceMap() void InstanceMap::InitVisibilityDistance() { //init visibility distance for instances - m_VisibleDistance = sWorld.GetMaxVisibleDistanceInInstances(); + m_VisibleDistance = World::GetMaxVisibleDistanceInInstances(); } /* @@ -2823,7 +2823,7 @@ BattleGroundMap::~BattleGroundMap() void BattleGroundMap::InitVisibilityDistance() { //init visibility distance for BG/Arenas - m_VisibleDistance = sWorld.GetMaxVisibleDistanceInBGArenas(); + m_VisibleDistance = World::GetMaxVisibleDistanceInBGArenas(); } bool BattleGroundMap::CanEnter(Player * player) diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index b414b00fcc9..ae6a01003cf 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -67,10 +67,9 @@ MapManager::Initialize() // debugging code, should be deleted some day { - for (int i=0; i<MAX_GRID_STATE; i++) - { + for (uint8 i = 0; i < MAX_GRID_STATE; ++i) i_GridStates[i] = si_GridStates[i]; - } + i_GridStateErrorCount = 0; } |