diff options
| author | zori <zajast@o2.pl> | 2016-12-03 17:48:55 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2016-12-03 17:48:55 +0100 |
| commit | 0df0cb30ca9de2015ec774e50bb69337382576d3 (patch) | |
| tree | b33a67f88c01380986cfd02ab78b8134b3850f2a /src/tools | |
| parent | 881cd78ae32d8078e247f64a73c651959a76e746 (diff) | |
Correct Nav type for WMO objects (#18364)
* Tools/MMaps: Correct liquid type for WMO objects
* MMaps: Update version to 6
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index bf157a228dd..c61cd3154b8 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -26,7 +26,7 @@ #include <limits.h> #define MMAP_MAGIC 0x4d4d4150 // 'MMAP' -#define MMAP_VERSION 5 +#define MMAP_VERSION 6 struct MmapTileHeader { diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 69b1ffcb062..486134640e2 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -710,7 +710,7 @@ namespace MMAP uint8 type = NAV_EMPTY; // convert liquid type to NavTerrain - switch (liquid->GetType()) + switch (liquid->GetType() & 3) { case 0: case 1: |
