aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2021-04-04 21:49:50 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-04 20:44:25 +0100
commit1ba940b17ae4ab43b91a590ea69b19c0c428dd48 (patch)
treeba52b5d1cf81e905d8159eedc26e6788ca2f03fe /src/tools
parent89e183704cab51b245537f3f2f8c6ceb9339740b (diff)
Core/Maps: Change .map file version from FourCC to uint32 (#26326)
(cherry picked from commit 42877e75e2a67514dfeb185661e4f397b6eb044a)
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/map_extractor/System.cpp2
-rw-r--r--src/tools/mmaps_generator/TerrainBuilder.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index b36a207d610..2fdfe85c91a 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -1098,7 +1098,7 @@ void ExtractMaps(uint32 build)
if (FILE* tileList = fopen(Trinity::StringFormat("%s/maps/%04u.tilelist", output_path.string().c_str(), map_ids[z].Id).c_str(), "wb"))
{
fwrite(MapMagic.data(), 1, MapMagic.size(), tileList);
- fwrite(MapVersionMagic.data(), 1, MapVersionMagic.size(), tileList);
+ fwrite(&MapVersionMagic, 1, sizeof(MapVersionMagic), tileList);
fwrite(&build, sizeof(build), 1, tileList);
fwrite(existingTiles.to_string().c_str(), 1, existingTiles.size(), tileList);
fclose(tileList);
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 22127611fc3..529f50d84c3 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -26,8 +26,6 @@
namespace MMAP
{
- char const* MAP_VERSION_MAGIC = "v1.9";
-
TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid){ }
TerrainBuilder::~TerrainBuilder() { }