diff options
| author | maximius <none@none> | 2009-09-14 16:50:01 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-14 16:50:01 -0700 |
| commit | 6cb428318af4aba5ebb9d9340284165ca6181065 (patch) | |
| tree | 9aee2db05975f78bf96fc0bbfff47a5fa4fca112 /src/game/Map.cpp | |
| parent | 33f8f5ac2d2b99819ce7e0f4aad4fa0648eba35e (diff) | |
| parent | 140ec674a040bdc04086472330a289c2d15ecc65 (diff) | |
*Merge..
--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 2fba8c37d2c..4c6dbba2e90 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1870,8 +1870,7 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const // Makers' Overlook (ground and cave) else if (x > 5634.48f && x < 5774.53f && y < 3475.0f && z > 300.0f) { - if(y > 3380.26f || y > 3265.0f && z < 360.0f) - areaflag = 2187; + if(y > 3380.26f || y > 3265.0f && z < 360.0f) areaflag = 2187; } break; // The Makers' Perch (underground) @@ -1950,7 +1949,7 @@ void Map::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 area bool Map::IsInWater(float x, float y, float pZ, float min_depth) const { // Check surface in x, y point for liquid - if (const_cast<Map*>(this)->GetGrid(x, y)) + if (GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y)) { LiquidData liquid_status; if (getLiquidStatus(x, y, pZ, MAP_ALL_LIQUIDS, &liquid_status)) @@ -1964,7 +1963,7 @@ bool Map::IsInWater(float x, float y, float pZ, float min_depth) const bool Map::IsUnderWater(float x, float y, float z) const { - if (const_cast<Map*>(this)->GetGrid(x, y)) + if (GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y)) { if (getLiquidStatus(x, y, z, MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN)&LIQUID_MAP_UNDER_WATER) return true; |