diff options
| -rw-r--r-- | src/common/Collision/BoundingIntervalHierarchy.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/VMapDefinitions.h | 4 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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<uint32> &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] = |