diff options
| author | aap <aap@papnet.eu> | 2020-12-07 22:03:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 22:03:12 +0100 |
| commit | 61c6b28237100cc674f63b6b203135f422647d4c (patch) | |
| tree | 7d0adbb328aac0467d05ea6289b4abdb8900bd30 /src/objects/Object.h | |
| parent | Fix font bug (diff) | |
| parent | Implement DAMAGE_EFFECT_SMASH_VEGPALM and code style fixes (diff) | |
| download | re3-61c6b28237100cc674f63b6b203135f422647d4c.tar re3-61c6b28237100cc674f63b6b203135f422647d4c.tar.gz re3-61c6b28237100cc674f63b6b203135f422647d4c.tar.bz2 re3-61c6b28237100cc674f63b6b203135f422647d4c.tar.lz re3-61c6b28237100cc674f63b6b203135f422647d4c.tar.xz re3-61c6b28237100cc674f63b6b203135f422647d4c.tar.zst re3-61c6b28237100cc674f63b6b203135f422647d4c.zip | |
Diffstat (limited to 'src/objects/Object.h')
| -rw-r--r-- | src/objects/Object.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h index bc74b58b..e34043a8 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -32,23 +32,23 @@ enum CollisionDamageEffect DAMAGE_EFFECT_CHANGE_THEN_SMASH, DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY = 50, - DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY, + DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY = 51, DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60, DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70, 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_NEWSTANDNEW2 = 92, + DAMAGE_EFFECT_SMASH_NEWSTANDNEW3 = 93, + DAMAGE_EFFECT_SMASH_NEWSTANDNEW4 = 94, + DAMAGE_EFFECT_SMASH_NEWSTANDNEW5 = 95, 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, + DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL = 132, }; class CVehicle; @@ -76,7 +76,7 @@ public: uint8 m_nCollisionDamageEffect; uint8 m_nSpecialCollisionResponseCases; bool m_bCameraToAvoidThisObject; - int8 m_nBeachballBounces; + uint8 m_nBeachballBounces; uint32 m_obj_unused1; uint32 m_nEndOfLifeTime; int16 m_nRefModelIndex; |