diff options
| author | Golrag <golrag.jeremy@gmail.com> | 2017-07-14 18:00:51 +0200 |
|---|---|---|
| committer | Golrag <golrag.jeremy@gmail.com> | 2017-07-14 18:00:51 +0200 |
| commit | 89d641f1e68d11359a2398ff51d3d6eee1470ae8 (patch) | |
| tree | a332db41a08cd43a2e984ca90847e8387463b055 /src/tools | |
| parent | 9c1a426202baf40412bb3ce8f97a9ac0820c9dfd (diff) | |
Core/VMaps: Fix no collision triangles
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/wmo.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index aeac69b6751..ff2dd61cb07 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 |