Fix typo in VMap BIH generation (#18297)

Fix typo in VMap BIH generation
By zorix
(cherry picked from commit 2402f47642)

Core/Maps: bumping Vmap version after 2402f47642

Re-extracting vmaps is required
(cherry picked from commit ec9a8345a4)

Core/Map: missing file change in last commit
(cherry picked from commit 881cd78ae3)
This commit is contained in:
Aokromes
2016-11-28 01:19:16 +01:00
committed by joschiwald
parent f18f75bbb7
commit 22396f1bcf
3 changed files with 4 additions and 4 deletions

View File

@@ -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;

View File

@@ -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...

View File

@@ -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] =