diff options
| author | maximius <none@none> | 2009-11-22 19:56:48 -0800 |
|---|---|---|
| committer | maximius <none@none> | 2009-11-22 19:56:48 -0800 |
| commit | 055f16f525fde75b911972610c517cb6f3c0966f (patch) | |
| tree | 0b6e0e3268b38bbe5aa0810c7cc836fb25d410a9 /src/game/Map.cpp | |
| parent | 9b7f2240b8f2130d0fb818953afbbc2477287693 (diff) | |
*Little cleanup, and access GetMaxVisibleDistance functions statically instead of through the sWorld singleton.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 14 |
1 files changed, 7 insertions, 7 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) |