mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 02:10:01 +00:00
got rid of superfluous enum
This commit is contained in:
parent
15520fe77d
commit
224727c14d
|
@ -174,12 +174,12 @@ CObject::ObjectDamage(float amount)
|
||||||
const float fDirectionZ = 0.0002f * amount;
|
const float fDirectionZ = 0.0002f * amount;
|
||||||
switch (m_nCollisionDamageEffect)
|
switch (m_nCollisionDamageEffect)
|
||||||
{
|
{
|
||||||
case COLDAMAGE_EFFECT_CHANGE_MODEL:
|
case COLLRESPONSE_CHANGE_MODEL:
|
||||||
bRenderDamaged = true;
|
bRenderDamaged = true;
|
||||||
break;
|
break;
|
||||||
case COLDAMAGE_EFFECT_SPLIT_MODEL:
|
case COLLRESPONSE_SPLIT_MODEL:
|
||||||
break;
|
break;
|
||||||
case COLDAMAGE_EFFECT_SMASH_COMPLETELY:
|
case COLLRESPONSE_SMASH_COMPLETELY:
|
||||||
bIsVisible = false;
|
bIsVisible = false;
|
||||||
bUsesCollision = false;
|
bUsesCollision = false;
|
||||||
bIsStatic = true;
|
bIsStatic = true;
|
||||||
|
@ -187,7 +187,7 @@ CObject::ObjectDamage(float amount)
|
||||||
SetMoveSpeed(0.0f, 0.0f, 0.0f);
|
SetMoveSpeed(0.0f, 0.0f, 0.0f);
|
||||||
SetTurnSpeed(0.0f, 0.0f, 0.0f);
|
SetTurnSpeed(0.0f, 0.0f, 0.0f);
|
||||||
break;
|
break;
|
||||||
case COLDAMAGE_EFFECT_CHANGE_THEN_SMASH:
|
case COLLRESPONSE_CHANGE_THEN_SMASH:
|
||||||
if (!bRenderDamaged) {
|
if (!bRenderDamaged) {
|
||||||
bRenderDamaged = true;
|
bRenderDamaged = true;
|
||||||
}
|
}
|
||||||
|
@ -200,7 +200,7 @@ CObject::ObjectDamage(float amount)
|
||||||
SetTurnSpeed(0.0f, 0.0f, 0.0f);
|
SetTurnSpeed(0.0f, 0.0f, 0.0f);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case COLDAMAGE_EFFECT_SMASH_CARDBOX_COMPLETELY: {
|
case COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY: {
|
||||||
bIsVisible = false;
|
bIsVisible = false;
|
||||||
bUsesCollision = false;
|
bUsesCollision = false;
|
||||||
bIsStatic = true;
|
bIsStatic = true;
|
||||||
|
@ -223,7 +223,7 @@ CObject::ObjectDamage(float amount)
|
||||||
PlayOneShotScriptObject(_SCRSOUND_CARDBOARD_BOX_SMASH, vecPos);
|
PlayOneShotScriptObject(_SCRSOUND_CARDBOARD_BOX_SMASH, vecPos);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case COLDAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY: {
|
case COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY: {
|
||||||
bIsVisible = false;
|
bIsVisible = false;
|
||||||
bUsesCollision = false;
|
bUsesCollision = false;
|
||||||
bIsStatic = true;
|
bIsStatic = true;
|
||||||
|
@ -246,7 +246,7 @@ CObject::ObjectDamage(float amount)
|
||||||
PlayOneShotScriptObject(_SCRSOUND_WOODEN_BOX_SMASH, vecPos);
|
PlayOneShotScriptObject(_SCRSOUND_WOODEN_BOX_SMASH, vecPos);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case COLDAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: {
|
case COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY: {
|
||||||
bIsVisible = false;
|
bIsVisible = false;
|
||||||
bUsesCollision = false;
|
bUsesCollision = false;
|
||||||
bIsStatic = true;
|
bIsStatic = true;
|
||||||
|
@ -271,7 +271,7 @@ CObject::ObjectDamage(float amount)
|
||||||
PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos);
|
PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case COLDAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: {
|
case COLLRESPONSE_SMASH_BARPOST_COMPLETELY: {
|
||||||
bIsVisible = false;
|
bIsVisible = false;
|
||||||
bUsesCollision = false;
|
bUsesCollision = false;
|
||||||
bIsStatic = true;
|
bIsStatic = true;
|
||||||
|
|
|
@ -10,18 +10,6 @@ enum {
|
||||||
CUTSCENE_OBJECT = 4,
|
CUTSCENE_OBJECT = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
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 {
|
enum {
|
||||||
COLLRESPONSE_NONE,
|
COLLRESPONSE_NONE,
|
||||||
COLLRESPONSE_CHANGE_MODEL,
|
COLLRESPONSE_CHANGE_MODEL,
|
||||||
|
|
Loading…
Reference in a new issue