summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-06 17:17:07 +0200
committeraap <aap@papnet.eu>2020-05-06 17:17:07 +0200
commita76b88da087c26f2f1847480d3885a76478f6dee (patch)
treef20c66293599bad32dd51d468dc58ddeb24eab33 /src/objects
parentsorted out object collision enums (diff)
downloadre3-a76b88da087c26f2f1847480d3885a76478f6dee.tar
re3-a76b88da087c26f2f1847480d3885a76478f6dee.tar.gz
re3-a76b88da087c26f2f1847480d3885a76478f6dee.tar.bz2
re3-a76b88da087c26f2f1847480d3885a76478f6dee.tar.lz
re3-a76b88da087c26f2f1847480d3885a76478f6dee.tar.xz
re3-a76b88da087c26f2f1847480d3885a76478f6dee.tar.zst
re3-a76b88da087c26f2f1847480d3885a76478f6dee.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/Object.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 80b9015c..2afb621c 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -25,13 +25,29 @@ enum CollisionDamageEffect
DAMAGE_EFFECT_NONE,
DAMAGE_EFFECT_CHANGE_MODEL,
DAMAGE_EFFECT_SPLIT_MODEL,
- DAMAGE_EFFECT_SMASH_COMPLETELY,
+ DAMAGE_EFFECT_SMASH_AND_DAMAGE_TRAFFICLIGHTS,
+
+ DAMAGE_EFFECT_SMASH_COMPLETELY = 20,
DAMAGE_EFFECT_CHANGE_THEN_SMASH,
DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY = 50,
+ DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY,
+
DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60,
DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70,
- DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80
+ DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80,
+
+ DAMAGE_EFFECT_SMASH_NEWSTANDNEW1 = 91,
+ DAMAGE_EFFECT_SMASH_NEWSTANDNEW21,
+ DAMAGE_EFFECT_SMASH_NEWSTANDNEW31,
+ DAMAGE_EFFECT_SMASH_NEWSTANDNEW41,
+ DAMAGE_EFFECT_SMASH_NEWSTANDNEW51,
+
+ DAMAGE_EFFECT_SMASH_BLACKBAG = 100,
+ DAMAGE_EFFECT_SMASH_VEGPALM = 110,
+ DAMAGE_EFFECT_BURST_BEACHBALL = 120,
+ DAMAGE_EFFECT_SMASH_BEACHLOUNGE_WOOD = 131,
+ DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL,
};
class CVehicle;