diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-04-04 21:49:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-04 21:49:50 +0200 |
| commit | 42877e75e2a67514dfeb185661e4f397b6eb044a (patch) | |
| tree | 8d9f61ee90395eba9a82d1613b874b2e2df3e7eb /src/tools | |
| parent | 39bd263c72757acb7facd27cc12b0230866a8f25 (diff) | |
Core/Maps: Change .map file version from FourCC to uint32 (#26326)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 4 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 3698caead75..58cf2034d95 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -262,7 +262,7 @@ void ReadLiquidTypeTableDBC() // Map file format data static char const* MAP_MAGIC = "MAPS"; -static char const* MAP_VERSION_MAGIC = "v1.9"; +static uint32 const MAP_VERSION_MAGIC = 9; static char const* MAP_AREA_MAGIC = "AREA"; static char const* MAP_HEIGHT_MAGIC = "MHGT"; static char const* MAP_LIQUID_MAGIC = "MLIQ"; @@ -379,7 +379,7 @@ bool ConvertADT(std::string const& inputPath, std::string const& outputPath, int // Prepare map header map_fileheader map; map.mapMagic = *reinterpret_cast<uint32 const*>(MAP_MAGIC); - map.versionMagic = *reinterpret_cast<uint32 const*>(MAP_VERSION_MAGIC); + map.versionMagic = MAP_VERSION_MAGIC; map.buildMagic = build; // Get area flags data diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 5cbc31959ac..23ca452cd8f 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -82,7 +82,7 @@ uint32 GetLiquidFlags(uint32 liquidId); namespace MMAP { - char const* MAP_VERSION_MAGIC = "v1.9"; + uint32 const MAP_VERSION_MAGIC = 9; TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid){ } TerrainBuilder::~TerrainBuilder() { } @@ -144,7 +144,7 @@ namespace MMAP map_fileheader fheader; if (fread(&fheader, sizeof(map_fileheader), 1, mapFile) != 1 || - fheader.versionMagic != *((uint32 const*)(MAP_VERSION_MAGIC))) + fheader.versionMagic != MAP_VERSION_MAGIC) { fclose(mapFile); printf("%s is the wrong version, please extract new .map files\n", mapFileName); |