diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index 4352db220a..004f83f2eb 100644 --- a/src/common/Collision/Maps/MapDefines.h +++ b/src/common/Collision/Maps/MapDefines.h @@ -5,7 +5,7 @@ #include "DetourNavMesh.h" const uint32 MMAP_MAGIC = 0x4d4d4150; // 'MMAP' -#define MMAP_VERSION 13 +#define MMAP_VERSION 14 struct MmapTileHeader { diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 0df15ade6a..3d58a172f9 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -56,7 +56,7 @@ BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(RespawnListContainer::value_type) u_map_magic MapMagic = { {'M','A','P','S'} }; -uint32 MapVersionMagic = 9; +uint32 MapVersionMagic = 10; u_map_magic MapAreaMagic = { {'A','R','E','A'} }; u_map_magic MapHeightMagic = { {'M','H','G','T'} }; u_map_magic MapLiquidMagic = { {'M','L','I','Q'} }; diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index f52244dcfb..e53c455d00 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -451,7 +451,7 @@ void ReadLiquidTypeTable() // Map file format data static char const* MAP_MAGIC = "MAPS"; -static uint32 const MAP_VERSION_MAGIC = 9; +static uint32 const MAP_VERSION_MAGIC = 10; static char const* MAP_AREA_MAGIC = "AREA"; static char const* MAP_HEIGHT_MAGIC = "MHGT"; static char const* MAP_LIQUID_MAGIC = "MLIQ"; @@ -985,7 +985,10 @@ 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 118b83f1c8..8be2152397 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -79,7 +79,7 @@ struct map_liquidHeader namespace MMAP { - uint32 const MAP_VERSION_MAGIC = 9; + uint32 const MAP_VERSION_MAGIC = 10; TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid){ } TerrainBuilder::~TerrainBuilder() { }