aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorleak <leak@bitmx.net>2012-03-24 15:50:18 +0100
committerleak <leak@bitmx.net>2012-03-24 15:50:18 +0100
commit09dcee986722d0dc14046a4ab2dafa795f4f1708 (patch)
treedc3ec2227ab8d2c4217bcd8881d58ef77d66e55e /src
parent3d0063abee02bca855f98cb9b45f92c5a9d86215 (diff)
Core: Fix warnings properly
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Maps/Map.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 379aa4a9722..127478f1484 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1527,7 +1527,8 @@ 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))
+ area = GetAreaEntryByAreaID(area->zone)
+ if (area)
overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
}
@@ -1802,7 +1803,8 @@ 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))
+ area = GetAreaEntryByAreaID(area->zone)
+ if (area)
overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
}