From ed75b0649add23e082976fa4e5d504bc0c312602 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 7 May 2015 00:07:44 +0200 Subject: Tools: Modified output files of all extractors to use 4 characters for map id and changed name format of map files to include a separator between values '_' that makes tokenization possible * This fixes generating mmaps for maps with id >= 1000 * Fixed a crash happening when unloading last phased mmap tile * Removed remaining references to libmpq in CMakeLists Reextracting maps/vmaps/mmaps IS REQUIRED after this commit --- src/tools/map_extractor/System.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/map_extractor') diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index ab9774a3038..9059867dce4 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -402,7 +402,7 @@ void ReadLiquidTypeTableDBC() // Map file format data static char const* MAP_MAGIC = "MAPS"; -static char const* MAP_VERSION_MAGIC = "v1.4"; +static char const* MAP_VERSION_MAGIC = "v1.5"; static char const* MAP_AREA_MAGIC = "AREA"; static char const* MAP_HEIGHT_MAGIC = "MHGT"; static char const* MAP_LIQUID_MAGIC = "MLIQ"; @@ -1091,7 +1091,7 @@ void ExtractMaps(uint32 build) continue; sprintf(storagePath, "World\\Maps\\%s\\%s_%u_%u.adt", map_ids[z].name, map_ids[z].name, x, y); - sprintf(output_filename, "%s/maps/%03u%02u%02u.map", output_path, map_ids[z].id, y, x); + sprintf(output_filename, "%s/maps/%04u_%02u_%02u.map", output_path, map_ids[z].id, y, x); ConvertADT(storagePath, output_filename, y, x, build); sprintf(storagePath, "World\\Maps\\%s\\%s_%u_%u_obj0.adt", map_ids[z].name, map_ids[z].name, x, y); -- cgit v1.2.3