diff options
| author | zori <zajast@o2.pl> | 2016-12-03 17:48:55 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2016-12-04 02:23:13 +0100 |
| commit | fcbbeb3644c2f19f6c074871e1cb47c7fb8876c0 (patch) | |
| tree | e11865a498d4835f2dc308e28856f0720457b528 /src | |
| parent | f2277dd6de7ea29fa47e226ca2084e1eaeb2559b (diff) | |
Correct Nav type for WMO objects (#18364)
* Tools/MMaps: Correct liquid type for WMO objects
* MMaps: Update version to 6
(cherry picked from commit 0df0cb30ca9de2015ec774e50bb69337382576d3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Collision/Maps/MapDefines.h | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index 33746558fe7..c1585628e5a 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 7 +#define MMAP_VERSION 8 struct MmapTileHeader { diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 5b9bac0ab02..e32096773db 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -29,7 +29,7 @@ #include "DetourCommon.h" #define MMAP_MAGIC 0x4d4d4150 // 'MMAP' -#define MMAP_VERSION 7 +#define MMAP_VERSION 8 struct MmapTileHeader { diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 5dd6bed30b0..8d0d6e4d750 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -705,7 +705,7 @@ namespace MMAP uint8 type = NAV_EMPTY; // convert liquid type to NavTerrain - switch (liquid->GetType()) + switch (liquid->GetType() & 3) { case 0: case 1: |