aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2013-01-22 19:34:04 +0000
committerNay <dnpd.dd@gmail.com>2013-01-22 19:34:27 +0000
commit6fc17c6b1e0dadc3429ffa67b753ac492ddbd7a1 (patch)
tree27cf8185281d2844e1b642f9213dcca58647e3b6 /src/tools
parent7a76de93f83984a05bc38e321ca2f710cfd221d4 (diff)
Core: Fix compile warnings
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/mmaps_generator/TerrainBuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index c3d6541dfa3..6f26a43fa05 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -296,7 +296,7 @@ namespace MMAP
}
// FIXME: "the address of ‘liquid_type’ will always evaluate as ‘true’"
- if (liquid_type && liquid_map)
+ if (liquid_map)
{
int count = meshData.liquidVerts.size() / 3;
float xoffset = (float(tileX)-32)*GRID_SIZE;
@@ -393,7 +393,7 @@ namespace MMAP
// FIXME: "warning: the address of ‘liquid_type’ will always evaluate as ‘true’"
// if there is no liquid, don't use liquid
- if (!liquid_type || !meshData.liquidVerts.size() || !ltriangles.size())
+ if (!meshData.liquidVerts.size() || !ltriangles.size())
useLiquid = false;
else
{