Some smaller fixes to the vmapextractor courtesy of Lynx3d (not using corefunctions + update errormessages to use the new fileextensions)

--HG--
branch : trunk

src/server/collision/Maps/MapTree.cpp

@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Errors.h"
 #include "MapTree.h"
 #include "ModelInstance.h"
 #include "VMapManager2.h"
@@ -27,6 +26,12 @@
 #include <iomanip>
 #include <limits>
 
+#ifndef NO_CORE_FUNCS
+    #include "Errors.h"
+#else
+    #define ASSERT(x)
+#endif
+
 using G3D::Vector3;
 
 namespace VMAP

src/server/game/World/World.cpp

@@ -1274,7 +1274,7 @@ void World::SetInitialWorldSettings()
         ||m_configs[CONFIG_EXPANSION] && (
         !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f)))
     {
-        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmap/*vmdir files in '%svmaps'. Please place *.map/*.vmap/*.vmdir files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
+        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
         exit(1);
     }
 

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)
 

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...