From 59d4e1d3a806a4f2f48f535be366bde1b24d737e Mon Sep 17 00:00:00 2001
From: Nefertumm <anngelo.venturini@gmail.com>
Date: Thu, 3 Jan 2019 14:27:11 -0300
Subject: [PATCH] Core: Vmaps update 4.3 (#1021)

Vmaps update from 4.2 to 4.3
---
 src/common/Collision/VMapDefinitions.h   |  4 ++--
 src/tools/vmap4_extractor/vmapexport.cpp |  2 +-
 src/tools/vmap4_extractor/wmo.cpp        |  5 +++--
 src/tools/vmap4_extractor/wmo.h          | 18 +++++++++++-------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h
index 156372b38..fa1d5b09e 100644
--- a/src/common/Collision/VMapDefinitions.h
+++ b/src/common/Collision/VMapDefinitions.h
@@ -12,8 +12,8 @@
 
 namespace VMAP
 {
-    const char VMAP_MAGIC[] = "VMAP_4.2";
-    const char RAW_VMAP_MAGIC[] = "VMAP042";                // used in extracted vmap files with raw data
+    const char VMAP_MAGIC[] = "VMAP_4.3";
+    const char RAW_VMAP_MAGIC[] = "VMAP043";                // 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 133f367dc..1f1994a78 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -64,7 +64,7 @@ bool preciseVectorData = false;
 
 //static const char * szWorkDirMaps = ".\\Maps";
 const char* szWorkDirWmo = "./Buildings";
-const char* szRawVMAPMagic = "VMAP042";
+const char* szRawVMAPMagic = "VMAP043";
 
 // Local testing functions
 
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index e699b2845..90fd9e4d4 100644
--- a/src/tools/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
@@ -338,8 +338,9 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool precise
         for (int i=0; i<nTriangles; ++i)
         {
             // Skip no collision triangles
-            if (MOPY[2*i]&WMO_MATERIAL_NO_COLLISION ||
-              !(MOPY[2*i]&(WMO_MATERIAL_HINT|WMO_MATERIAL_COLLIDE_HIT)) )
+            bool isRenderFace = (MOPY[2 * i] & WMO_MATERIAL_RENDER) && !(MOPY[2 * i] & WMO_MATERIAL_DETAIL);
+            bool isCollision = MOPY[2 * i] & WMO_MATERIAL_COLLISION || isRenderFace;
+            if (!isCollision)
                 continue;
             // Use this triangle
             for (int j=0; j<3; ++j)
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 42d771c77..ce70acc64 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -15,13 +15,17 @@
 #include "loadlib/loadlib.h"
 
 // MOPY flags
-#define WMO_MATERIAL_NOCAMCOLLIDE    0x01
-#define WMO_MATERIAL_DETAIL          0x02
-#define WMO_MATERIAL_NO_COLLISION    0x04
-#define WMO_MATERIAL_HINT            0x08
-#define WMO_MATERIAL_RENDER          0x10
-#define WMO_MATERIAL_COLLIDE_HIT     0x20
-#define WMO_MATERIAL_WALL_SURFACE    0x40
+enum MopyFlags
+{
+    WHO_MATERIAL_UNK01            = 0x01,
+    WMO_MATERIAL_NOCAMCOLLIDE     = 0x02,
+    WMO_MATERIAL_DETAIL           = 0x04,
+    WMO_MATERIAL_COLLISION        = 0x08,
+    WMO_MATERIAL_HINT             = 0x10,
+    WMO_MATERIAL_RENDER           = 0x20,
+    WMO_MATERIAL_WALL_SURFACE     = 0x40, // Guessed
+    WMO_MATERIAL_COLLIDE_HIT      = 0x80,
+};
 
 class WMOInstance;
 class WMOManager;