nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 21:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Tools/Mapextractor): Fix water height redundancy algorithm ignoring "no water" (#10947)

Browse Source
This commit is contained in:
IntelligentQuantum
2022-04-24 22:44:20 +04:30
committed by GitHub
parent 8b531b034b
commit 090cc5e2c6
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Collision/Maps/MapDefines.h
View File

@@ -13,7 +13,7 @@
#define SIZE_OF_GRIDS 533.3333f #define SIZE_OF_GRIDS 533.3333f
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP' #define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
#define MMAP_VERSION 12 #define MMAP_VERSION 13
struct MmapTileHeader struct MmapTileHeader
{ {

2
src/server/game/Maps/Map.cpp
View File

@@ -50,7 +50,7 @@ union u_map_magic
}; };
u_map_magic MapMagic = { {'M', 'A', 'P', 'S'} }; u_map_magic MapMagic = { {'M', 'A', 'P', 'S'} };
uint32 MapVersionMagic = 8; uint32 MapVersionMagic = 9;
u_map_magic MapAreaMagic = { {'A', 'R', 'E', 'A'} }; u_map_magic MapAreaMagic = { {'A', 'R', 'E', 'A'} };
u_map_magic MapHeightMagic = { {'M', 'H', 'G', 'T'} }; u_map_magic MapHeightMagic = { {'M', 'H', 'G', 'T'} };
u_map_magic MapLiquidMagic = { {'M', 'L', 'I', 'Q'} }; u_map_magic MapLiquidMagic = { {'M', 'L', 'I', 'Q'} };

9
src/tools/map_extractor/System.cpp
View File

@@ -308,7 +308,7 @@ void ReadLiquidTypeTableDBC()
// Map file format data // Map file format data
static char const* MAP_MAGIC = "MAPS"; 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_AREA_MAGIC = "AREA";
static char const* MAP_HEIGHT_MAGIC = "MHGT"; static char const* MAP_HEIGHT_MAGIC = "MHGT";
static char const* MAP_LIQUID_MAGIC = "MLIQ"; 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; if (minHeight > h) minHeight = h;
} }
else else
{
liquid_height[y][x] = CONF_use_minHeight; liquid_height[y][x] = CONF_use_minHeight;
if (minHeight > CONF_use_minHeight)
{
minHeight = CONF_use_minHeight;
}
}
} }
} }
map.liquidMapOffset = map.heightMapOffset + map.heightMapSize; map.liquidMapOffset = map.heightMapOffset + map.heightMapSize;

2
src/tools/mmaps_generator/TerrainBuilder.cpp
View File

@@ -80,7 +80,7 @@ struct map_liquidHeader
namespace MMAP namespace MMAP
{ {
uint32 const MAP_VERSION_MAGIC = 8; uint32 const MAP_VERSION_MAGIC = 9;
TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid) { } TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid) { }
TerrainBuilder::~TerrainBuilder() = default; TerrainBuilder::~TerrainBuilder() = default;