2 files changed, 8 insertions, 20 deletions

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index ab1290b0..a450ca56 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -173,12 +173,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;
@@ -186,7 +186,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;
 			}
@@ -199,7 +199,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;
@@ -222,7 +222,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;
@@ -245,7 +245,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;
@@ -270,7 +270,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,