diff options
| author | aap <aap@papnet.eu> | 2020-05-06 16:56:59 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 16:58:57 +0200 |
| commit | 224727c14d315bcd053ade72017a2f1232ad6a1a (patch) | |
| tree | db8b76ece6792da88a4fd454982633219816f463 /src/objects | |
| parent | fix memory corruption (diff) | |
| download | re3-224727c14d315bcd053ade72017a2f1232ad6a1a.tar re3-224727c14d315bcd053ade72017a2f1232ad6a1a.tar.gz re3-224727c14d315bcd053ade72017a2f1232ad6a1a.tar.bz2 re3-224727c14d315bcd053ade72017a2f1232ad6a1a.tar.lz re3-224727c14d315bcd053ade72017a2f1232ad6a1a.tar.xz re3-224727c14d315bcd053ade72017a2f1232ad6a1a.tar.zst re3-224727c14d315bcd053ade72017a2f1232ad6a1a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/objects/Object.cpp | 16 | ||||
| -rw-r--r-- | src/objects/Object.h | 12 |
2 files changed, 8 insertions, 20 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index fb1ab1a7..de883b89 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -174,12 +174,12 @@ CObject::ObjectDamage(float amount) const float fDirectionZ = 0.0002f * amount; switch (m_nCollisionDamageEffect) { - case COLDAMAGE_EFFECT_CHANGE_MODEL: + case COLLRESPONSE_CHANGE_MODEL: bRenderDamaged = true; break; - case COLDAMAGE_EFFECT_SPLIT_MODEL: + case COLLRESPONSE_SPLIT_MODEL: break; - case COLDAMAGE_EFFECT_SMASH_COMPLETELY: + case COLLRESPONSE_SMASH_COMPLETELY: bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -187,7 +187,7 @@ CObject::ObjectDamage(float amount) SetMoveSpeed(0.0f, 0.0f, 0.0f); SetTurnSpeed(0.0f, 0.0f, 0.0f); break; - case COLDAMAGE_EFFECT_CHANGE_THEN_SMASH: + case COLLRESPONSE_CHANGE_THEN_SMASH: if (!bRenderDamaged) { bRenderDamaged = true; } @@ -200,7 +200,7 @@ CObject::ObjectDamage(float amount) SetTurnSpeed(0.0f, 0.0f, 0.0f); } break; - case COLDAMAGE_EFFECT_SMASH_CARDBOX_COMPLETELY: { + case COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -223,7 +223,7 @@ CObject::ObjectDamage(float amount) PlayOneShotScriptObject(_SCRSOUND_CARDBOARD_BOX_SMASH, vecPos); break; } - case COLDAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY: { + case COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -246,7 +246,7 @@ CObject::ObjectDamage(float amount) PlayOneShotScriptObject(_SCRSOUND_WOODEN_BOX_SMASH, vecPos); break; } - case COLDAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: { + case COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -271,7 +271,7 @@ CObject::ObjectDamage(float amount) PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos); break; } - case COLDAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: { + case COLLRESPONSE_SMASH_BARPOST_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; diff --git a/src/objects/Object.h b/src/objects/Object.h index 319ec4bc..dfaa60db 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -11,18 +11,6 @@ enum { }; enum { - COLDAMAGE_EFFECT_NONE = 0, - COLDAMAGE_EFFECT_CHANGE_MODEL = 1, - COLDAMAGE_EFFECT_SPLIT_MODEL = 2, - COLDAMAGE_EFFECT_SMASH_COMPLETELY = 3, - COLDAMAGE_EFFECT_CHANGE_THEN_SMASH = 4, - COLDAMAGE_EFFECT_SMASH_CARDBOX_COMPLETELY = 50, - COLDAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60, - COLDAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70, - COLDAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80, -}; - -enum { COLLRESPONSE_NONE, COLLRESPONSE_CHANGE_MODEL, COLLRESPONSE_SPLIT_MODEL, |