diff options
| author | Warpten <vertozor@gmail.com> | 2017-11-22 15:16:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 15:16:36 +0100 |
| commit | 9614f9d8cf295d4135346d59e67fa47b51d2ed88 (patch) | |
| tree | 9bf5ee4e2645753b889890b7e8262e87f411c635 | |
| parent | e39aad472c750f6aa941428ea434a72d18f8dfbb (diff) | |
| parent | 89d641f1e68d11359a2398ff51d3d6eee1470ae8 (diff) | |
Merge pull request #20024 from Golrag/fix_collision
Core/VMaps: Fix no collision triangles
| -rw-r--r-- | src/common/Collision/VMapDefinitions.h | 4 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/wmo.cpp | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h index d5beac48a3c..5af52770dd3 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 9bc848a5ac1..e6340bde553 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -65,7 +65,7 @@ bool preciseVectorData = false; //static const char * szWorkDirMaps = ".\\Maps"; char const* szWorkDirWmo = "./Buildings"; -char const* szRawVMAPMagic = "VMAP043"; +char const* szRawVMAPMagic = "VMAP044"; // Local testing functions diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index 441fe281c04..d98e1f9112d 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -349,10 +349,8 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool precise { // 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; - - if (!isRenderFace && !isDetail && !isCollision) + bool isCollision = MOPY[2 * i] & WMO_MATERIAL_COLLISION || isRenderFace; + if (!isCollision) continue; // Use this triangle |