diff options
| -rw-r--r-- | src/common/Collision/Maps/MapDefines.h | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 | ||||
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 5 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index 8b093086a7f..bf35595af1d 100644 --- a/src/common/Collision/Maps/MapDefines.h +++ b/src/common/Collision/Maps/MapDefines.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/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 1f15e1f793c..3eacffc1ac5 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -55,7 +55,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 58cf2034d95..6b83a7d046d 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -262,7 +262,7 @@ void ReadLiquidTypeTableDBC() // 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"; @@ -781,7 +781,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 23ca452cd8f..c9743d229ac 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -82,7 +82,7 @@ uint32 GetLiquidFlags(uint32 liquidId); namespace MMAP { - uint32 const MAP_VERSION_MAGIC = 9; + uint32 const MAP_VERSION_MAGIC = 10; TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid){ } TerrainBuilder::~TerrainBuilder() { } |