From 22396f1bcf97d3568faa95f17dcbf0984bce0312 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 28 Nov 2016 01:19:16 +0100 Subject: Fix typo in VMap BIH generation (#18297) Fix typo in VMap BIH generation By zorix (cherry picked from commit 2402f476424531a175d9a016f433321f00608501) Core/Maps: bumping Vmap version after 2402f476424531a175d9a016f433321f00608501 Re-extracting vmaps is required (cherry picked from commit ec9a8345a49938ddd9d42e9fdf7053ac25477b4d) Core/Map: missing file change in last commit (cherry picked from commit 881cd78ae32d8078e247f64a73c651959a76e746) --- src/common/Collision/BoundingIntervalHierarchy.cpp | 2 +- src/common/Collision/VMapDefinitions.h | 4 ++-- src/tools/vmap4_extractor/vmapexport.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/common/Collision/BoundingIntervalHierarchy.cpp b/src/common/Collision/BoundingIntervalHierarchy.cpp index bd3bebdec0a..6ec215f14f8 100644 --- a/src/common/Collision/BoundingIntervalHierarchy.cpp +++ b/src/common/Collision/BoundingIntervalHierarchy.cpp @@ -152,13 +152,13 @@ void BIH::subdivide(int left, int right, std::vector &tempTree, buildDat else if (left > right) { // all right + right = rightOrig; if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split)) { // we are stuck here - create a leaf stats.updateLeaf(depth, right - left + 1); createNode(tempTree, nodeIndex, left, right); return; } - right = rightOrig; if (clipR >= split) { // keep looping on right half gridBox.lo[axis] = split; diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h index add4484e7d4..2a2d557c074 100644 --- a/src/common/Collision/VMapDefinitions.h +++ b/src/common/Collision/VMapDefinitions.h @@ -25,8 +25,8 @@ namespace VMAP { - const char VMAP_MAGIC[] = "VMAP_4.3"; - const char RAW_VMAP_MAGIC[] = "VMAP043"; // used in extracted vmap files with raw data + const char VMAP_MAGIC[] = "VMAP_4.4"; + const char RAW_VMAP_MAGIC[] = "VMAP044"; // used in extracted vmap files with raw data const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree"; // defined in TileAssembler.cpp currently... diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 0e788dc4d4c..db1cddba265 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -101,7 +101,7 @@ struct MapMeta //static const char * szWorkDirMaps = ".\\Maps"; const char* szWorkDirWmo = "./Buildings"; -const char* szRawVMAPMagic = "VMAP043"; +const char* szRawVMAPMagic = "VMAP044"; #define CASC_LOCALES_COUNT 17 char const* CascLocaleNames[CASC_LOCALES_COUNT] = -- cgit v1.2.3