Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

MapExtraction: Fix water height redundancy algorithm ignoring "no water" (#26324)

Browse Source 
* MapExtraction: Fix water height redundancy algorithm ignoring "no water"

* Update MMAP_VERSION

* Change map version

Co-authored-by: jackpoz <giacomopoz@gmail.com>
This commit is contained in:
killerwife
2021-04-04 21:52:57 +02:00
committed by GitHub
parent 42877e75e2
commit 00da074109
4 changed files with 7 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

@@ -22,7 +22,7 @@
#include "DetourNavMesh.h"
const uint32 MMAP_MAGIC = 0x4d4d4150; // 'MMAP'
#define MMAP_VERSION 13
#define MMAP_VERSION 14
struct MmapTileHeader
{

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

@@ -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'} };

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

@@ -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;

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

@@ -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() { }