From 45e2a65fad6549ff93005ff166fba309c20259e0 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Fri, 9 Jul 2010 18:02:46 +0200
Subject: Update VMap3 to "final" release (REEXTRACTION OF MAPS/VMAPS IS
 REQUIRED!) - thanks to Lynx3d (again) - add magic-header to .vmtile files -
 calculate waterlevels for non-flat surfaces in a more correct way - make MSVC
 shut up about float-issues - change logging around a bit (output function
 that the respective logentry comes from) - remove remaining Stormlib
 leftovers - set indoor/outdoor check to enabled by default (more blizzlike)

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/VMapAssembler.cpp |  4 +++-
 src/tools/vmap3_extractor/dbcfile.h         | 22 ++++++++++++++++++----
 src/tools/vmap3_extractor/vmapexport.cpp    |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/vmap3_assembler/VMapAssembler.cpp b/src/tools/vmap3_assembler/VMapAssembler.cpp
index 6666b54356c..d714db5ae45 100644
--- a/src/tools/vmap3_assembler/VMapAssembler.cpp
+++ b/src/tools/vmap3_assembler/VMapAssembler.cpp
@@ -76,11 +76,13 @@ A '#' at the beginning of a line defines a comment
     return(result);
 } */
 //=======================================================
+
 int main(int argc, char* argv[])
 {
     if(argc != 3 && argc != 4)
     {
-        printf("\nusage: %s <raw data dir> <vmap dest dir> [config file name]\n", argv[0]);
+        //printf("\nusage: %s <raw data dir> <vmap dest dir> [config file name]\n", argv[0]);
+        printf("\nusage: %s <raw data dir> <vmap dest dir>\n", argv[0]);
         return 1;
     }
 
diff --git a/src/tools/vmap3_extractor/dbcfile.h b/src/tools/vmap3_extractor/dbcfile.h
index 7381ab9f668..d405d6ffd60 100644
--- a/src/tools/vmap3_extractor/dbcfile.h
+++ b/src/tools/vmap3_extractor/dbcfile.h
@@ -1,13 +1,27 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef DBCFILE_H
 #define DBCFILE_H
-#define __STORMLIB_SELF__
 
 #include <cassert>
 #include <string>
-//#include "StormLib.h"
 
-#undef min
-#undef max
 class DBCFile
 {
 public:
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 82e9bd7cc7b..b82f9249f07 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -435,7 +435,7 @@ bool processArgv(int argc, char ** argv, const char *versionString)
 int main(int argc, char ** argv)
 {
     bool success=true;
-    const char *versionString = "V2.90 2010_05";
+    const char *versionString = "V3.00 2010_07";
 
     // Use command line arguments, when some
     if(!processArgv(argc, argv, versionString))
-- 
cgit v1.2.3