From 29d9e40f7482ff5b5b0944a339fcf7b89464bf2d Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Sat, 19 Jun 2010 21:35:32 +0200
Subject: Some smaller fixes to the vmapextractor courtesy of Lynx3d (not using
 corefunctions + update errormessages to use the new fileextensions)

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/CMakeLists.txt | 1 +
 src/tools/vmap3_extractor/wmo.cpp        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 7d3c02eb58b..8c79fff6804 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories(
   ${ACE_INCLUDE_DIR}
 )
 
+add_definitions(-DNO_CORE_FUNCS)
 add_executable(vmap3assembler VMapAssembler.cpp)
 target_link_libraries(vmap3assembler collision g3dlib)
 
diff --git a/src/tools/vmap3_extractor/wmo.cpp b/src/tools/vmap3_extractor/wmo.cpp
index 650d2279f28..216a2248953 100644
--- a/src/tools/vmap3_extractor/wmo.cpp
+++ b/src/tools/vmap3_extractor/wmo.cpp
@@ -386,7 +386,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPrecis
         if (rootWMO->liquidType & 4)
             liquidEntry = liquidType;
         else if (liquidType == 15)
-            liquidEntry = 0;
+            liquidEntry = 1; // first entry, generic "Water"
         else
             liquidEntry = liquidType + 1;
         // overwrite material type in header...
-- 
cgit v1.2.3