diff options
| author | jackpoz <giacomopoz@gmail.com> | 2020-06-24 22:53:41 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2020-06-24 22:53:41 +0200 |
| commit | 3ac1992afbeb1cd7669b300b8ee4131d39f35595 (patch) | |
| tree | 4599a9bfd65b84cb73b8bb97e688bf6893ae8068 /src | |
| parent | 3227ed94bc7e8a6833fe67a2edb63debcca90a60 (diff) | |
Core/MMAPs: Fix small steps being considered as NAV_AREA_GROUND_STEEP
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Collision/Maps/MapDefines.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index dbd3d63c828..877ab964f2f 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 11 +#define MMAP_VERSION 12 struct MmapTileHeader { @@ -51,11 +51,11 @@ enum NavArea NAV_AREA_EMPTY = 0, // areas 1-60 will be used for destructible areas (currently skipped in vmaps, WMO with flag 1) // ground is the highest value to make recast choose ground over water when merging surfaces very close to each other (shallow water would be walkable) - NAV_AREA_GROUND_STEEP = 11, - NAV_AREA_GROUND = 10, + NAV_AREA_GROUND = 11, + NAV_AREA_GROUND_STEEP = 10, NAV_AREA_WATER = 9, NAV_AREA_MAGMA_SLIME = 8, // don't need to differentiate between them - NAV_AREA_MAX_VALUE = NAV_AREA_GROUND_STEEP, + NAV_AREA_MAX_VALUE = NAV_AREA_GROUND, NAV_AREA_MIN_VALUE = NAV_AREA_MAGMA_SLIME, NAV_AREA_ALL_MASK = 0x3F // max allowed value }; @@ -63,8 +63,8 @@ enum NavArea enum NavTerrainFlag { NAV_EMPTY = 0x00, - NAV_GROUND_STEEP = 1 << (NAV_AREA_MAX_VALUE - NAV_AREA_GROUND_STEEP), NAV_GROUND = 1 << (NAV_AREA_MAX_VALUE - NAV_AREA_GROUND), + NAV_GROUND_STEEP = 1 << (NAV_AREA_MAX_VALUE - NAV_AREA_GROUND_STEEP), NAV_WATER = 1 << (NAV_AREA_MAX_VALUE - NAV_AREA_WATER), NAV_MAGMA_SLIME = 1 << (NAV_AREA_MAX_VALUE - NAV_AREA_MAGMA_SLIME) }; |