diff --git a/contrib/vmap_extract_assembler_bin/vmapExtractor3.exe b/contrib/vmap_extract_assembler_bin/vmapExtractor3.exe index db9552732..61879c34e 100644 Binary files a/contrib/vmap_extract_assembler_bin/vmapExtractor3.exe and b/contrib/vmap_extract_assembler_bin/vmapExtractor3.exe differ diff --git a/contrib/vmap_extractor_v2/.gitignore b/contrib/vmap_extractor_v3/.gitignore similarity index 100% rename from contrib/vmap_extractor_v2/.gitignore rename to contrib/vmap_extractor_v3/.gitignore diff --git a/contrib/vmap_extractor_v2/CMakeLists.txt b/contrib/vmap_extractor_v3/CMakeLists.txt similarity index 100% rename from contrib/vmap_extractor_v2/CMakeLists.txt rename to contrib/vmap_extractor_v3/CMakeLists.txt diff --git a/contrib/vmap_extractor_v2/README b/contrib/vmap_extractor_v3/README similarity index 100% rename from contrib/vmap_extractor_v2/README rename to contrib/vmap_extractor_v3/README diff --git a/contrib/vmap_extractor_v2/vmapextract/.gitignore b/contrib/vmap_extractor_v3/vmapextract/.gitignore similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/.gitignore rename to contrib/vmap_extractor_v3/vmapextract/.gitignore diff --git a/contrib/vmap_extractor_v2/vmapextract/CMakeLists.txt b/contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/CMakeLists.txt rename to contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp b/contrib/vmap_extractor_v3/vmapextract/adtfile.cpp similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/adtfile.cpp rename to contrib/vmap_extractor_v3/vmapextract/adtfile.cpp diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.h b/contrib/vmap_extractor_v3/vmapextract/adtfile.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/adtfile.h rename to contrib/vmap_extractor_v3/vmapextract/adtfile.h diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp b/contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp rename to contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.h b/contrib/vmap_extractor_v3/vmapextract/dbcfile.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/dbcfile.h rename to contrib/vmap_extractor_v3/vmapextract/dbcfile.h diff --git a/contrib/vmap_extractor_v2/vmapextract/loadlib/loadlib.h b/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/loadlib/loadlib.h rename to contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h diff --git a/contrib/vmap_extractor_v2/vmapextract/model.cpp b/contrib/vmap_extractor_v3/vmapextract/model.cpp similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/model.cpp rename to contrib/vmap_extractor_v3/vmapextract/model.cpp diff --git a/contrib/vmap_extractor_v2/vmapextract/model.h b/contrib/vmap_extractor_v3/vmapextract/model.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/model.h rename to contrib/vmap_extractor_v3/vmapextract/model.h diff --git a/contrib/vmap_extractor_v2/vmapextract/modelheaders.h b/contrib/vmap_extractor_v3/vmapextract/modelheaders.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/modelheaders.h rename to contrib/vmap_extractor_v3/vmapextract/modelheaders.h diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq_libmpq.cpp b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq.cpp similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/mpq_libmpq.cpp rename to contrib/vmap_extractor_v3/vmapextract/mpq_libmpq.cpp diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq_libmpq04.h b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/mpq_libmpq04.h rename to contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h diff --git a/contrib/vmap_extractor_v2/vmapextract/vec3d.h b/contrib/vmap_extractor_v3/vmapextract/vec3d.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/vec3d.h rename to contrib/vmap_extractor_v3/vmapextract/vec3d.h diff --git a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp similarity index 99% rename from contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp rename to contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp index a11d05e37..b1d9cad04 100644 --- a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp +++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp @@ -436,7 +436,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)) diff --git a/contrib/vmap_extractor_v2/vmapextract/vmapexport.h b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/vmapexport.h rename to contrib/vmap_extractor_v3/vmapextract/vmapexport.h diff --git a/contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp b/contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp rename to contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp diff --git a/contrib/vmap_extractor_v2/vmapextract/wdtfile.h b/contrib/vmap_extractor_v3/vmapextract/wdtfile.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/wdtfile.h rename to contrib/vmap_extractor_v3/vmapextract/wdtfile.h diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp b/contrib/vmap_extractor_v3/vmapextract/wmo.cpp similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/wmo.cpp rename to contrib/vmap_extractor_v3/vmapextract/wmo.cpp diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.h b/contrib/vmap_extractor_v3/vmapextract/wmo.h similarity index 100% rename from contrib/vmap_extractor_v2/vmapextract/wmo.h rename to contrib/vmap_extractor_v3/vmapextract/wmo.h diff --git a/contrib/vmap_extractor_v2/win/.gitignore b/contrib/vmap_extractor_v3/win/.gitignore similarity index 100% rename from contrib/vmap_extractor_v2/win/.gitignore rename to contrib/vmap_extractor_v3/win/.gitignore diff --git a/contrib/vmap_extractor_v2/win/VC100/.gitignore b/contrib/vmap_extractor_v3/win/VC100/.gitignore similarity index 100% rename from contrib/vmap_extractor_v2/win/VC100/.gitignore rename to contrib/vmap_extractor_v3/win/VC100/.gitignore diff --git a/contrib/vmap_extractor_v2/win/VC100/vmapExtractor3.vcxproj b/contrib/vmap_extractor_v3/win/VC100/vmapExtractor3.vcxproj similarity index 100% rename from contrib/vmap_extractor_v2/win/VC100/vmapExtractor3.vcxproj rename to contrib/vmap_extractor_v3/win/VC100/vmapExtractor3.vcxproj diff --git a/contrib/vmap_extractor_v2/win/VC90/.gitignore b/contrib/vmap_extractor_v3/win/VC90/.gitignore similarity index 100% rename from contrib/vmap_extractor_v2/win/VC90/.gitignore rename to contrib/vmap_extractor_v3/win/VC90/.gitignore diff --git a/contrib/vmap_extractor_v2/win/VC90/vmapExtractor3.vcproj b/contrib/vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj similarity index 100% rename from contrib/vmap_extractor_v2/win/VC90/vmapExtractor3.vcproj rename to contrib/vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj diff --git a/contrib/vmap_extractor_v2/win/vmapExtractor3_VC100.sln b/contrib/vmap_extractor_v3/win/vmapExtractor3_VC100.sln similarity index 100% rename from contrib/vmap_extractor_v2/win/vmapExtractor3_VC100.sln rename to contrib/vmap_extractor_v3/win/vmapExtractor3_VC100.sln diff --git a/contrib/vmap_extractor_v2/win/vmapExtractor3_VC90.sln b/contrib/vmap_extractor_v3/win/vmapExtractor3_VC90.sln similarity index 100% rename from contrib/vmap_extractor_v2/win/vmapExtractor3_VC90.sln rename to contrib/vmap_extractor_v3/win/vmapExtractor3_VC90.sln diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f3db3dc64..3f167db02 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10166" + #define REVISION_NR "10167" #endif // __REVISION_NR_H__