diff options
| author | Golrag <golrag.jeremy@gmail.com> | 2017-07-14 18:00:51 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-18 18:53:13 +0200 |
| commit | c46aa9d5b52486aba68e3827ee7263ddf6e2a323 (patch) | |
| tree | 3a9eecbbdfaa5f47ce3c95a5ae6c202b36619265 /src | |
| parent | 35bf146969db69f596a3247ae490e27131a8e0a3 (diff) | |
Core/VMaps: Fix no collision triangles
(cherry picked from commit 89d641f1e68d11359a2398ff51d3d6eee1470ae8)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Collision/VMapDefinitions.h | 4 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/wmo.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h index 2a8938d1fd8..f9d0c7ac546 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.8"; - const char RAW_VMAP_MAGIC[] = "VMAP048"; // used in extracted vmap files with raw data + const char VMAP_MAGIC[] = "VMAP_4.9"; + const char RAW_VMAP_MAGIC[] = "VMAP049"; // used in extracted vmap files with raw data const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree"; // defined in VMapManager2.cpp currently... diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index 62376b999ca..5c060c9dafd 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -440,10 +440,9 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE* output, bool preciseVectorData) { // Skip no collision triangles bool isRenderFace = (MOPY[2 * i] & WMO_MATERIAL_RENDER) && !(MOPY[2 * i] & WMO_MATERIAL_DETAIL); - bool isDetail = (MOPY[2 * i] & WMO_MATERIAL_DETAIL) != 0; - bool isCollision = (MOPY[2 * i] & WMO_MATERIAL_COLLISION) != 0; + bool isCollision = MOPY[2 * i] & WMO_MATERIAL_COLLISION || isRenderFace; - if (!isRenderFace && !isDetail && !isCollision) + if (!isCollision) continue; // Use this triangle |