aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
authorleak <leak@bitmx.net>2012-03-24 15:37:54 +0100
committerleak <leak@bitmx.net>2012-03-24 15:37:54 +0100
commit3d0063abee02bca855f98cb9b45f92c5a9d86215 (patch)
tree49aea25bced4c4104d8f08263bcb008a2b86a032 /src/server/game/Maps/Map.cpp
parentbdbc1312c3e595b0720407d32e6fc7cb92daf14a (diff)
Core: Fix warnings
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rwxr-xr-xsrc/server/game/Maps/Map.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 86d95857cce..379aa4a9722 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1526,8 +1526,10 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
{
uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
if (!overrideLiquid && area->zone)
+ {
if (area = GetAreaEntryByAreaID(area->zone))
overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
+ }
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
{
@@ -1799,8 +1801,10 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp
{
uint32 overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
if (!overrideLiquid && area->zone)
+ {
if (area = GetAreaEntryByAreaID(area->zone))
overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
+ }
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
{