nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Collision): typo in VMap BIH generation. (#7066)

Browse Source 
* Core/Collision: Fix typo in VMap BIH generation.

Fixed #5768.

* Bump vmap and mmap versions.

* chore: update data version in the bash installer
This commit is contained in:
UltraNix
2021-08-08 12:21:29 +02:00
committed by GitHub
parent f01cb2d71b
commit 261d5c62cd
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/installer/includes/functions.sh
View File

@@ -219,7 +219,7 @@ function inst_simple_restarter {
function inst_download_client_data { function inst_download_client_data {
# change the following version when needed # change the following version when needed
local VERSION=v10 local VERSION=v11
echo "#######################" echo "#######################"
echo "Client data downloader" echo "Client data downloader"

2
src/common/Collision/BoundingIntervalHierarchy.cpp
View File

@@ -148,6 +148,7 @@ void BIH::subdivide(int left, int right, std::vector<uint32>& tempTree, buildDat
else if (left > right) else if (left > right)
{ {
// all right // all right
right = rightOrig;
if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split)) if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split))
{ {
// we are stuck here - create a leaf // we are stuck here - create a leaf
@@ -155,7 +156,6 @@ void BIH::subdivide(int left, int right, std::vector<uint32>& tempTree, buildDat
createNode(tempTree, nodeIndex, left, right); createNode(tempTree, nodeIndex, left, right);
return; return;
} }
right = rightOrig;
if (clipR >= split) if (clipR >= split)
{ {
// keep looping on right half // keep looping on right half

2
src/common/Collision/Maps/MapDefines.h
View File

@@ -13,7 +13,7 @@
#define SIZE_OF_GRIDS 533.3333f #define SIZE_OF_GRIDS 533.3333f
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP' #define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
#define MMAP_VERSION 11 #define MMAP_VERSION 12
struct MmapTileHeader struct MmapTileHeader
{ {

4
src/common/Collision/VMapDefinitions.h
View File

@@ -12,8 +12,8 @@
namespace VMAP namespace VMAP
{ {
const char VMAP_MAGIC[] = "VMAP_4.5"; const char VMAP_MAGIC[] = "VMAP_4.6";
const char RAW_VMAP_MAGIC[] = "VMAP045"; // used in extracted vmap files with raw data const char RAW_VMAP_MAGIC[] = "VMAP046"; // used in extracted vmap files with raw data
const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree"; const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree";
// defined in TileAssembler.cpp currently... // defined in TileAssembler.cpp currently...

4
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -445,8 +445,8 @@ public:
Map2ZoneCoordinates(zoneX, zoneY, zoneId); Map2ZoneCoordinates(zoneX, zoneY, zoneId);
Map const* map = object->GetMap(); Map const* map = object->GetMap();
float groundZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), MAX_HEIGHT); float groundZ = object->GetMapHeight(object->GetPositionX(), object->GetPositionY(), MAX_HEIGHT);
float floorZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ()); float floorZ = object->GetMapHeight(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ());
GridCoord gridCoord = Acore::ComputeGridCoord(object->GetPositionX(), object->GetPositionY()); GridCoord gridCoord = Acore::ComputeGridCoord(object->GetPositionX(), object->GetPositionY());

4
src/tools/vmap4_extractor/vmapexport.h
View File

@@ -13,8 +13,8 @@
namespace VMAP namespace VMAP
{ {
const char VMAP_MAGIC[] = "VMAP_4.5"; const char VMAP_MAGIC[] = "VMAP_4.6";
const char RAW_VMAP_MAGIC[] = "VMAP045"; // used in extracted vmap files with raw data const char RAW_VMAP_MAGIC[] = "VMAP046"; // used in extracted vmap files with raw data
} }
enum ModelFlags enum ModelFlags