summaryrefslogtreecommitdiffstats
path: root/src/entities/Object.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-19 18:35:51 +0200
committeraap <aap@papnet.eu>2019-06-19 18:35:51 +0200
commit2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f (patch)
tree4bb63db3c36f43ae63e1560d19d36ccb46ed37ac /src/entities/Object.h
parentimplemented CPedStats (diff)
downloadre3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.tar
re3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.tar.gz
re3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.tar.bz2
re3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.tar.lz
re3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.tar.xz
re3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.tar.zst
re3-2ec11b000db3af4cb5cd9a5d70dd050edfbdc99f.zip
Diffstat (limited to 'src/entities/Object.h')
-rw-r--r--src/entities/Object.h21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/entities/Object.h b/src/entities/Object.h
index c9800e20..2079ff0e 100644
--- a/src/entities/Object.h
+++ b/src/entities/Object.h
@@ -9,6 +9,21 @@ enum {
CUTSCENE_OBJECT = 4,
};
+enum {
+ COLLRESPONSE_NONE,
+ COLLRESPONSE_CHANGE_MODEL,
+ COLLRESPONSE_SPLIT_MODEL,
+ COLLRESPONSE_SMASH_COMPLETELY,
+ COLLRESPONSE_CHANGE_THEN_SMASH,
+ COLLRESPONSE_UNKNOWN5,
+
+ COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY = 50,
+ COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY = 60,
+ COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY = 70,
+ COLLRESPONSE_SMASH_BARPOST_COMPLETELY = 80,
+
+};
+
class CVehicle;
class CObject : public CPhysical
@@ -28,9 +43,9 @@ public:
int8 field_172;
int8 field_173;
float m_fCollisionDamageMultiplier;
- int8 m_nCollisionDamageEffect;
- int8 m_bSpecialCollisionResponseCases;
- int8 m_bCameraToAvoidThisObject;
+ uint8 m_nCollisionDamageEffect;
+ uint8 m_nSpecialCollisionResponseCases;
+ bool m_bCameraToAvoidThisObject;
int8 field_17B;
int8 field_17C;
int8 field_17D;