diff options
| author | IntelligentQuantum <IntelligentQuantum@ProtonMail.Com> | 2022-04-24 22:44:20 +0430 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-24 15:14:20 -0300 |
| commit | 090cc5e2c6600a8b746a181bfa708ca5239fedb3 (patch) | |
| tree | 5994ed4bf75be4a5d5ff99d5e9fe28f04c9832e9 /src/tools | |
| parent | 8b531b034b5f101429a178d0c2b9dfea4e932c32 (diff) | |
fix(Tools/Mapextractor): Fix water height redundancy algorithm ignoring "no water" (#10947)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 9 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 955119f2dc..62ac294ace 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -308,7 +308,7 @@ void ReadLiquidTypeTableDBC() // Map file format data static char const* MAP_MAGIC = "MAPS"; -static uint32 const MAP_VERSION_MAGIC = 8; +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"; @@ -841,7 +841,14 @@ bool ConvertADT(std::string const& inputPath, std::string const& outputPath, int 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; diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index f2a8ce344c..d5e2a9a4c3 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -80,7 +80,7 @@ struct map_liquidHeader namespace MMAP { - uint32 const MAP_VERSION_MAGIC = 8; + uint32 const MAP_VERSION_MAGIC = 9; TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid) { } TerrainBuilder::~TerrainBuilder() = default; |