diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-04-04 21:49:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-04 20:44:25 +0100 |
| commit | 1ba940b17ae4ab43b91a590ea69b19c0c428dd48 (patch) | |
| tree | ba52b5d1cf81e905d8159eedc26e6788ca2f03fe /src/common | |
| parent | 89e183704cab51b245537f3f2f8c6ceb9339740b (diff) | |
Core/Maps: Change .map file version from FourCC to uint32 (#26326)
(cherry picked from commit 42877e75e2a67514dfeb185661e4f397b6eb044a)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Collision/Maps/MapDefines.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Maps/MapDefines.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/Collision/Maps/MapDefines.cpp b/src/common/Collision/Maps/MapDefines.cpp index ab2dfd9b04f..a22e6c793a9 100644 --- a/src/common/Collision/Maps/MapDefines.cpp +++ b/src/common/Collision/Maps/MapDefines.cpp @@ -18,7 +18,7 @@ #include "MapDefines.h" u_map_magic const MapMagic = { { 'M','A','P','S' } }; -u_map_magic const MapVersionMagic = { { 'v','1','.','9' } }; +uint32 const MapVersionMagic = 9; u_map_magic const MapAreaMagic = { { 'A','R','E','A' } }; u_map_magic const MapHeightMagic = { { 'M','H','G','T' } }; u_map_magic const MapLiquidMagic = { { 'M','L','I','Q' } }; diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index 304a1da8985..c95fa1ede2a 100644 --- a/src/common/Collision/Maps/MapDefines.h +++ b/src/common/Collision/Maps/MapDefines.h @@ -26,7 +26,7 @@ using u_map_magic = std::array<char, 4>; TC_COMMON_API extern u_map_magic const MapMagic; -TC_COMMON_API extern u_map_magic const MapVersionMagic; +TC_COMMON_API extern uint32 const MapVersionMagic; TC_COMMON_API extern u_map_magic const MapAreaMagic; TC_COMMON_API extern u_map_magic const MapHeightMagic; TC_COMMON_API extern u_map_magic const MapLiquidMagic; @@ -37,7 +37,7 @@ TC_COMMON_API extern u_map_magic const MapLiquidMagic; struct map_fileheader { u_map_magic mapMagic; - u_map_magic versionMagic; + uint32 versionMagic; uint32 buildMagic; uint32 areaMapOffset; uint32 areaMapSize; |