diff options
| author | killerwife <killerwife@gmail.com> | 2021-04-04 21:52:57 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-04 20:44:25 +0100 |
| commit | 2467f799bb85c30daae0df83810336486f9ed1a5 (patch) | |
| tree | c96347247e58e365d00efb03db02bb3f453683dc /src | |
| parent | 1ba940b17ae4ab43b91a590ea69b19c0c428dd48 (diff) | |
MapExtraction: Fix water height redundancy algorithm ignoring "no water" (#26324)
* MapExtraction: Fix water height redundancy algorithm ignoring "no water"
* Update MMAP_VERSION
* Change map version
Co-authored-by: jackpoz <giacomopoz@gmail.com>
(cherry picked from commit 00da074109e713280264761eedfbf6e5dc7ef912)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Collision/Maps/MMapDefines.h | 2 | ||||
| -rw-r--r-- | src/common/Collision/Maps/MapDefines.cpp | 2 | ||||
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/common/Collision/Maps/MMapDefines.h b/src/common/Collision/Maps/MMapDefines.h index a88a3100107..cf0b347610d 100644 --- a/src/common/Collision/Maps/MMapDefines.h +++ b/src/common/Collision/Maps/MMapDefines.h @@ -22,7 +22,7 @@ #include "DetourNavMesh.h" const uint32 MMAP_MAGIC = 0x4d4d4150; // 'MMAP' -#define MMAP_VERSION 13 +#define MMAP_VERSION 14 struct MmapTileHeader { diff --git a/src/common/Collision/Maps/MapDefines.cpp b/src/common/Collision/Maps/MapDefines.cpp index a22e6c793a9..c0b6d1d37b0 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' } }; -uint32 const MapVersionMagic = 9; +uint32 const MapVersionMagic = 10; 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/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 2fdfe85c91a..bde10bc6fe0 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -878,7 +878,10 @@ bool ConvertADT(ChunkedFile& adt, std::string const& mapName, std::string const& if (minHeight > h) minHeight = h; } else + { liquid_height[y][x] = CONF_use_minHeight; + if (minHeight > CONF_use_minHeight) minHeight = CONF_use_minHeight; + } } } map.liquidMapOffset = map.heightMapOffset + map.heightMapSize; |