From 6627fe72039153b00bb87775867e09453f2b24e6 Mon Sep 17 00:00:00 2001 From: Ka0z Date: Fri, 10 Feb 2012 18:40:05 -0300 Subject: [PATCH] Core/Collision: Edit source files to represent the recent changes in the extractors (v4.00 2012_02) to avoid confusion with old extractors (v3.00 2010_07) --- src/tools/CMakeLists.txt | 4 ++-- .../CMakeLists.txt | 12 ++++++------ .../VMapAssembler.cpp | 0 .../CMakeLists.txt | 10 +++++----- .../{vmap3_extractor => vmap4_extractor}/adtfile.cpp | 0 .../{vmap3_extractor => vmap4_extractor}/adtfile.h | 0 .../{vmap3_extractor => vmap4_extractor}/dbcfile.cpp | 0 .../{vmap3_extractor => vmap4_extractor}/dbcfile.h | 0 .../gameobject_extract.cpp | 0 .../loadlib/loadlib.h | 0 .../{vmap3_extractor => vmap4_extractor}/model.cpp | 0 .../{vmap3_extractor => vmap4_extractor}/model.h | 0 .../modelheaders.h | 0 .../mpq_libmpq.cpp | 0 .../mpq_libmpq04.h | 0 .../{vmap3_extractor => vmap4_extractor}/vec3d.h | 0 .../vmapexport.cpp | 2 +- .../vmapexport.h | 0 .../{vmap3_extractor => vmap4_extractor}/wdtfile.cpp | 0 .../{vmap3_extractor => vmap4_extractor}/wdtfile.h | 0 .../{vmap3_extractor => vmap4_extractor}/wmo.cpp | 0 src/tools/{vmap3_extractor => vmap4_extractor}/wmo.h | 0 22 files changed, 14 insertions(+), 14 deletions(-) rename src/tools/{vmap3_assembler => vmap4_assembler}/CMakeLists.txt (78%) rename src/tools/{vmap3_assembler => vmap4_assembler}/VMapAssembler.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/CMakeLists.txt (82%) rename src/tools/{vmap3_extractor => vmap4_extractor}/adtfile.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/adtfile.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/dbcfile.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/dbcfile.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/gameobject_extract.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/loadlib/loadlib.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/model.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/model.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/modelheaders.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/mpq_libmpq.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/mpq_libmpq04.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/vec3d.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/vmapexport.cpp (99%) rename src/tools/{vmap3_extractor => vmap4_extractor}/vmapexport.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/wdtfile.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/wdtfile.h (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/wmo.cpp (100%) rename src/tools/{vmap3_extractor => vmap4_extractor}/wmo.h (100%) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 82f71aed030..a956655ffaa 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -9,5 +9,5 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. add_subdirectory(map_extractor) -add_subdirectory(vmap3_assembler) -add_subdirectory(vmap3_extractor) +add_subdirectory(vmap4_assembler) +add_subdirectory(vmap4_extractor) diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt similarity index 78% rename from src/tools/vmap3_assembler/CMakeLists.txt rename to src/tools/vmap4_assembler/CMakeLists.txt index 42ffc749ba8..e4f57646c49 100644 --- a/src/tools/vmap3_assembler/CMakeLists.txt +++ b/src/tools/vmap4_assembler/CMakeLists.txt @@ -21,21 +21,21 @@ include_directories( ) add_definitions(-DNO_CORE_FUNCS) -add_executable(vmap3assembler VMapAssembler.cpp) -add_dependencies(vmap3assembler mpq) +add_executable(vmap4assembler VMapAssembler.cpp) +add_dependencies(vmap4assembler mpq) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - set_target_properties(vmap3assembler PROPERTIES LINK_FLAGS "-framework Carbon") + set_target_properties(vmap4assembler PROPERTIES LINK_FLAGS "-framework Carbon") endif() -target_link_libraries(vmap3assembler +target_link_libraries(vmap4assembler collision g3dlib ${ZLIB_LIBRARIES} ) if( UNIX ) - install(TARGETS vmap3assembler DESTINATION bin) + install(TARGETS vmap4assembler DESTINATION bin) elseif( WIN32 ) - install(TARGETS vmap3assembler DESTINATION "${CMAKE_INSTALL_PREFIX}") + install(TARGETS vmap4assembler DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() diff --git a/src/tools/vmap3_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp similarity index 100% rename from src/tools/vmap3_assembler/VMapAssembler.cpp rename to src/tools/vmap4_assembler/VMapAssembler.cpp diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt similarity index 82% rename from src/tools/vmap3_extractor/CMakeLists.txt rename to src/tools/vmap4_extractor/CMakeLists.txt index 2ff2fd0cf6b..1c44b01bbec 100644 --- a/src/tools/vmap3_extractor/CMakeLists.txt +++ b/src/tools/vmap4_extractor/CMakeLists.txt @@ -31,18 +31,18 @@ elseif( WIN32 ) ) endif() -add_executable(vmap3extractor ${sources}) +add_executable(vmap4extractor ${sources}) -target_link_libraries(vmap3extractor +target_link_libraries(vmap4extractor ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} mpq ) -add_dependencies(vmap3extractor mpq) +add_dependencies(vmap4extractor mpq) if( UNIX ) - install(TARGETS vmap3extractor DESTINATION bin) + install(TARGETS vmap4extractor DESTINATION bin) elseif( WIN32 ) - install(TARGETS vmap3extractor DESTINATION "${CMAKE_INSTALL_PREFIX}") + install(TARGETS vmap4extractor DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() diff --git a/src/tools/vmap3_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp similarity index 100% rename from src/tools/vmap3_extractor/adtfile.cpp rename to src/tools/vmap4_extractor/adtfile.cpp diff --git a/src/tools/vmap3_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h similarity index 100% rename from src/tools/vmap3_extractor/adtfile.h rename to src/tools/vmap4_extractor/adtfile.h diff --git a/src/tools/vmap3_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp similarity index 100% rename from src/tools/vmap3_extractor/dbcfile.cpp rename to src/tools/vmap4_extractor/dbcfile.cpp diff --git a/src/tools/vmap3_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h similarity index 100% rename from src/tools/vmap3_extractor/dbcfile.h rename to src/tools/vmap4_extractor/dbcfile.h diff --git a/src/tools/vmap3_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp similarity index 100% rename from src/tools/vmap3_extractor/gameobject_extract.cpp rename to src/tools/vmap4_extractor/gameobject_extract.cpp diff --git a/src/tools/vmap3_extractor/loadlib/loadlib.h b/src/tools/vmap4_extractor/loadlib/loadlib.h similarity index 100% rename from src/tools/vmap3_extractor/loadlib/loadlib.h rename to src/tools/vmap4_extractor/loadlib/loadlib.h diff --git a/src/tools/vmap3_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp similarity index 100% rename from src/tools/vmap3_extractor/model.cpp rename to src/tools/vmap4_extractor/model.cpp diff --git a/src/tools/vmap3_extractor/model.h b/src/tools/vmap4_extractor/model.h similarity index 100% rename from src/tools/vmap3_extractor/model.h rename to src/tools/vmap4_extractor/model.h diff --git a/src/tools/vmap3_extractor/modelheaders.h b/src/tools/vmap4_extractor/modelheaders.h similarity index 100% rename from src/tools/vmap3_extractor/modelheaders.h rename to src/tools/vmap4_extractor/modelheaders.h diff --git a/src/tools/vmap3_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp similarity index 100% rename from src/tools/vmap3_extractor/mpq_libmpq.cpp rename to src/tools/vmap4_extractor/mpq_libmpq.cpp diff --git a/src/tools/vmap3_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h similarity index 100% rename from src/tools/vmap3_extractor/mpq_libmpq04.h rename to src/tools/vmap4_extractor/mpq_libmpq04.h diff --git a/src/tools/vmap3_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h similarity index 100% rename from src/tools/vmap3_extractor/vec3d.h rename to src/tools/vmap4_extractor/vec3d.h diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp similarity index 99% rename from src/tools/vmap3_extractor/vmapexport.cpp rename to src/tools/vmap4_extractor/vmapexport.cpp index bf5fe1c517f..599290a9254 100644 --- a/src/tools/vmap3_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -457,7 +457,7 @@ bool processArgv(int argc, char ** argv, const char *versionString) int main(int argc, char ** argv) { bool success=true; - const char *versionString = "V3.00 2010_07"; + const char *versionString = "V4.00 2012_02"; // Use command line arguments, when some if(!processArgv(argc, argv, versionString)) diff --git a/src/tools/vmap3_extractor/vmapexport.h b/src/tools/vmap4_extractor/vmapexport.h similarity index 100% rename from src/tools/vmap3_extractor/vmapexport.h rename to src/tools/vmap4_extractor/vmapexport.h diff --git a/src/tools/vmap3_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp similarity index 100% rename from src/tools/vmap3_extractor/wdtfile.cpp rename to src/tools/vmap4_extractor/wdtfile.cpp diff --git a/src/tools/vmap3_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h similarity index 100% rename from src/tools/vmap3_extractor/wdtfile.h rename to src/tools/vmap4_extractor/wdtfile.h diff --git a/src/tools/vmap3_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp similarity index 100% rename from src/tools/vmap3_extractor/wmo.cpp rename to src/tools/vmap4_extractor/wmo.cpp diff --git a/src/tools/vmap3_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h similarity index 100% rename from src/tools/vmap3_extractor/wmo.h rename to src/tools/vmap4_extractor/wmo.h