diff options
| author | Kitzunu <24550914+Kitzunu@users.noreply.github.com> | 2021-09-20 00:45:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 00:45:42 +0200 |
| commit | 6df7303b2404824a8d1e4396247fcec97c876963 (patch) | |
| tree | e340efdf4fde80e6e6078c0542fd7a85a10fdcaa /src/tools | |
| parent | b70083599bf743a8265797b7f8dcf78ecad81024 (diff) | |
refactor(Core/Maps): Change map file version from FourCC to uint32 (#7866)
Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com>
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 0ce52635e2..a98ddf4250 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -298,7 +298,7 @@ void ReadLiquidTypeTableDBC() // Map file format data static char const* MAP_MAGIC = "MAPS"; -static char const* MAP_VERSION_MAGIC = "v1.8"; +static uint32 const MAP_VERSION_MAGIC = 8; static char const* MAP_AREA_MAGIC = "AREA"; static char const* MAP_HEIGHT_MAGIC = "MHGT"; static char const* MAP_LIQUID_MAGIC = "MLIQ"; @@ -415,7 +415,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 a7fedeba73..4e84c869b3 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -69,7 +69,7 @@ struct map_liquidHeader namespace MMAP { - char const* MAP_VERSION_MAGIC = "v1.8"; + uint32 const MAP_VERSION_MAGIC = 8; TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid) { } TerrainBuilder::~TerrainBuilder() = default; @@ -131,7 +131,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); |