Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset d3fe2d6d504a (please test your patches thoroughly before getting me to push them ogeraisi)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-14 16:49:23 -07:00
parent b37f9b1e55
commit 140ec674a0
34 changed files with 111 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/Map.cpp
View File

@@ -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;