diff --git a/src/game/WorldHandlers/GridMap.cpp b/src/game/WorldHandlers/GridMap.cpp index 501450dc..efdd08ce 100644 --- a/src/game/WorldHandlers/GridMap.cpp +++ b/src/game/WorldHandlers/GridMap.cpp @@ -37,7 +37,7 @@ #include "Util.h" char const* MAP_MAGIC = "MAPS"; -char const* MAP_VERSION_MAGIC = "z1.3"; +char const* MAP_VERSION_MAGIC = "z1.4"; char const* MAP_AREA_MAGIC = "AREA"; char const* MAP_HEIGHT_MAGIC = "MHGT"; char const* MAP_LIQUID_MAGIC = "MLIQ"; diff --git a/src/game/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h index f70f6559..f6a2c474 100644 --- a/src/game/vmap/VMapDefinitions.h +++ b/src/game/vmap/VMapDefinitions.h @@ -32,7 +32,6 @@ namespace VMAP { const char VMAP_MAGIC[] = "VMAP_4.0"; /**< used in final vmap files */ - //const char RAW_VMAP_MAGIC[] = "VMAP005"; /**< used in extracted vmap files with raw data */ const char GAMEOBJECT_MODELS[] = "temp_gameobject_models"; /**< TODO */ /** diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp index 992b36f3..2c042af6 100644 --- a/src/mangosd/Main.cpp +++ b/src/mangosd/Main.cpp @@ -45,7 +45,7 @@ char serviceName[] = "mangosd"; char serviceLongName[] = "MaNGOS world service"; char serviceDescription[] = "Massive Network Game Object Server"; -const char RAW_VMAP_MAGIC[] = "VMAPz05"; /**< used in extracted vmap files with raw data */ +const char RAW_VMAP_MAGIC[] = "VMAPz06"; /**< used in extracted vmap files with raw data */ /* * -1 - not in service mode * 0 - stopped diff --git a/src/tools/Extractor_projects b/src/tools/Extractor_projects index 8f492dbb..a5c94fe0 160000 --- a/src/tools/Extractor_projects +++ b/src/tools/Extractor_projects @@ -1 +1 @@ -Subproject commit 8f492dbbd39ddd79af2ce254f7dbf76b8564bf7a +Subproject commit a5c94fe0031f9e33352f0df19ac68bcbfb86e868