From dbb7f65723fd4c46ae7f12801fa12ca2196fcb03 Mon Sep 17 00:00:00 2001 From: killerwife Date: Sat, 24 Apr 2021 14:58:16 +0200 Subject: Vmap: Introduce skipping of antiportals and unreachable mogp (#26331) * Vmap: Introduce skipping of antiportals and unreachable mogp * Reduce differences with master branch * Update VMAP and MMAP versions * Update MMAPs version Co-authored-by: jackpoz (cherry picked from commit d5f1fefe7f6772b11e9fbb052bfd36be9bda98e2) --- src/common/Collision/Maps/MMapDefines.h | 2 +- src/common/Collision/VMapDefinitions.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common') diff --git a/src/common/Collision/Maps/MMapDefines.h b/src/common/Collision/Maps/MMapDefines.h index cf0b347610d..4f73094e907 100644 --- a/src/common/Collision/Maps/MMapDefines.h +++ b/src/common/Collision/Maps/MMapDefines.h @@ -22,7 +22,7 @@ #include "DetourNavMesh.h" const uint32 MMAP_MAGIC = 0x4d4d4150; // 'MMAP' -#define MMAP_VERSION 14 +#define MMAP_VERSION 15 struct MmapTileHeader { diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h index cb883c389c3..469b86408ae 100644 --- a/src/common/Collision/VMapDefinitions.h +++ b/src/common/Collision/VMapDefinitions.h @@ -24,8 +24,8 @@ namespace VMAP { - const char VMAP_MAGIC[] = "VMAP_4.A"; - const char RAW_VMAP_MAGIC[] = "VMAP04A"; // used in extracted vmap files with raw data + const char VMAP_MAGIC[] = "VMAP_4.B"; + const char RAW_VMAP_MAGIC[] = "VMAP04B"; // used in extracted vmap files with raw data const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree"; // defined in VMapManager2.cpp currently... -- cgit v1.2.3