summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-06 17:13:46 +0200
committeraap <aap@papnet.eu>2020-05-06 17:14:34 +0200
commitc11912a8ecf13bb664d8ee3dba1ac55eb363176f (patch)
tree7fc7cfc90b7e9a0f67ceed13721f53cefecdea78 /src/objects/Object.h
parentMerge branch 'master' into miami (diff)
downloadre3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar
re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.gz
re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.bz2
re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.lz
re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.xz
re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.zst
re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.zip
Diffstat (limited to 'src/objects/Object.h')
-rw-r--r--src/objects/Object.h29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h
index dfaa60db..80b9015c 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -10,19 +10,28 @@ enum {
CUTSCENE_OBJECT = 4,
};
-enum {
+enum CollisionSpecialResponseCase
+{
COLLRESPONSE_NONE,
- COLLRESPONSE_CHANGE_MODEL,
- COLLRESPONSE_SPLIT_MODEL,
- COLLRESPONSE_SMASH_COMPLETELY,
- COLLRESPONSE_CHANGE_THEN_SMASH,
- COLLRESPONSE_UNKNOWN5,
+ COLLRESPONSE_LAMPOST,
+ COLLRESPONSE_SMALLBOX,
+ COLLRESPONSE_BIGBOX,
+ COLLRESPONSE_FENCEPART,
+ COLLRESPONSE_UNKNOWN5
+};
- COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY = 50,
- COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY = 60,
- COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY = 70,
- COLLRESPONSE_SMASH_BARPOST_COMPLETELY = 80,
+enum CollisionDamageEffect
+{
+ DAMAGE_EFFECT_NONE,
+ DAMAGE_EFFECT_CHANGE_MODEL,
+ DAMAGE_EFFECT_SPLIT_MODEL,
+ DAMAGE_EFFECT_SMASH_COMPLETELY,
+ DAMAGE_EFFECT_CHANGE_THEN_SMASH,
+ DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY = 50,
+ DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60,
+ DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70,
+ DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80
};
class CVehicle;