From e77716188861d4aa83b227a90e04a66b63baeb1f Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Sat, 5 Jun 2010 00:59:25 +0200
Subject: HIGHLY EXPERIMENTAL - USE AT YOUR OWN RISK Implement the use of the
 new vmap3-format by Lynx3d (mad props to you for this, and thanks for the
 talks earlier) + reduced Vmap size to less than one third, and improve
 precision + indoor/outdoor check which allows automatic unmounting of players
 + additional area information from WMOAreaTable.dbc, removed existing "hacks"
 + WMO liquid information for swimming and fishing correctly in
 buildings/cities/caves/instances (lava and slime WILL hurt from now on!) -
 buildfiles for windows are not properly done, and will need to be sorted out
 NOTE: Do NOT annoy Lynx3d about this, any issues with this "port" is entirely
 our fault ! THIS REVISION IS CONSIDERED UNSTABLE AND CONTAINS WORK IN
 PROGRESS - USE AT YOUR OWN RISK!

--HG--
branch : trunk
---
 contrib/vmap_assembler/vmap_assembler.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'contrib/vmap_assembler/vmap_assembler.cpp')

diff --git a/contrib/vmap_assembler/vmap_assembler.cpp b/contrib/vmap_assembler/vmap_assembler.cpp
index e6a3089f328..6666b54356c 100644
--- a/contrib/vmap_assembler/vmap_assembler.cpp
+++ b/contrib/vmap_assembler/vmap_assembler.cpp
@@ -54,7 +54,7 @@ File contains map names that should be split into tiles
 A '#' at the beginning of a line defines a comment
 */
 
-bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa)
+/* bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa)
 {
     bool result = false;
     char buffer[501];
@@ -74,7 +74,7 @@ bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa)
         result = true;
     }
     return(result);
-}
+} */
 //=======================================================
 int main(int argc, char* argv[])
 {
@@ -97,7 +97,7 @@ int main(int argc, char* argv[])
     All the names in the list are considered to be world maps or huge instances.
     These maps will be spilt into tiles in the vmap assemble process
     */
-    if(conffile != NULL)
+    /* if(conffile != NULL)
     {
         if(!readConfigFile(conffile, ta))
         {
@@ -105,9 +105,9 @@ int main(int argc, char* argv[])
             delete ta;
             return 1;
         }
-    }
+    } */
 
-    if(!ta->convertWorld())
+    if(!ta->convertWorld2())
     {
         printf("exit with errors\n");
         delete ta;
@@ -118,4 +118,3 @@ int main(int argc, char* argv[])
     printf("Ok, all done\n");
     return 0;
 }
-
-- 
cgit v1.2.3