From 56320d24420e3eddd5f91141eff4c6d5284072eb Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Wed, 1 Jun 2016 23:26:50 -0700
Subject: [PATCH] DGRP Extract Fix

---
 DataSpec/DNACommon/CRSC.cpp                 | 2 +-
 DataSpec/DNACommon/DGRP.hpp                 | 2 +-
 Runtime/Particle/CCollisionResponseData.cpp | 4 ++--
 Runtime/Particle/CCollisionResponseData.hpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DataSpec/DNACommon/CRSC.cpp b/DataSpec/DNACommon/CRSC.cpp
index b0e077448..2a1976723 100644
--- a/DataSpec/DNACommon/CRSC.cpp
+++ b/DataSpec/DNACommon/CRSC.cpp
@@ -65,7 +65,7 @@ static const std::vector<FourCC> DecalTypes =
     SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'),
     SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'),
     SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'),
-    SBIG('CHDL'),SBIG('ENDL')
+    SBIG('CHDL')
 };
 
 
diff --git a/DataSpec/DNACommon/DGRP.hpp b/DataSpec/DNACommon/DGRP.hpp
index 6d321ffd9..1e2874832 100644
--- a/DataSpec/DNACommon/DGRP.hpp
+++ b/DataSpec/DNACommon/DGRP.hpp
@@ -17,7 +17,7 @@ struct DGRP : BigYAML
     {
         DECL_YAML
         DNAFourCC type;
-        UniqueID32 id;
+        IDType id;
     };
 
     Vector<ObjectTag, DNA_COUNT(dependCount)> depends;
diff --git a/Runtime/Particle/CCollisionResponseData.cpp b/Runtime/Particle/CCollisionResponseData.cpp
index b6abb286b..fd0aceb5e 100644
--- a/Runtime/Particle/CCollisionResponseData.cpp
+++ b/Runtime/Particle/CCollisionResponseData.cpp
@@ -62,14 +62,14 @@ static const std::vector<FourCC> GeneratorTypes =
     SBIG('3SVA'),SBIG('3RPR'),SBIG('3MTR'),SBIG('3PDS'),
     SBIG('3FLB'),SBIG('3DRN'),SBIG('3MRE'),SBIG('CHSH'),
     SBIG('JZSH'),SBIG('5ISE'),SBIG('5BSE'),SBIG('5ATB'),
-    SBIG('5ATA'),
+    SBIG('5ATA')
 };
 static const std::vector<FourCC> DecalTypes =
 {
     SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'),
     SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'),
     SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'),
-    SBIG('CHDL'),SBIG('ENDL')
+    SBIG('CHDL')
 };
 
 using CPF = CParticleDataFactory;
diff --git a/Runtime/Particle/CCollisionResponseData.hpp b/Runtime/Particle/CCollisionResponseData.hpp
index 0a3161373..cac57ce4c 100644
--- a/Runtime/Particle/CCollisionResponseData.hpp
+++ b/Runtime/Particle/CCollisionResponseData.hpp
@@ -16,7 +16,7 @@ class CDecalDescription;
 
 enum class EWeaponCollisionResponseTypes
 {
-    Unknown0, Unknown1, Metal, Grass,
+    Default, Unknown1, Metal, Grass,
     Ice, Goo, Wood, Water,
     Mud, Lava, Sand,Unknown11,
     Unknown12,Unknown13,Unknown14,Unknown15,