2 files changed, 27 insertions, 18 deletions

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index de883b89..a5896975 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 COLLRESPONSE_CHANGE_MODEL: 
+		case DAMAGE_EFFECT_CHANGE_MODEL: 
 			bRenderDamaged = true;
 			break;
-		case COLLRESPONSE_SPLIT_MODEL:
+		case DAMAGE_EFFECT_SPLIT_MODEL:
 			break;
-		case COLLRESPONSE_SMASH_COMPLETELY:
+		case DAMAGE_EFFECT_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 COLLRESPONSE_CHANGE_THEN_SMASH:
+		case DAMAGE_EFFECT_CHANGE_THEN_SMASH:
 			if (!bRenderDamaged) {
 				bRenderDamaged = true;
 			}
@@ -200,7 +200,7 @@ CObject::ObjectDamage(float amount)
 				SetTurnSpeed(0.0f, 0.0f, 0.0f);
 			}
 			break;
-		case COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY: {
+		case DAMAGE_EFFECT_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 COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY: {
+		case DAMAGE_EFFECT_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 COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY: {
+		case DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: {
 			bIsVisible = false;
 			bUsesCollision = false;
 			bIsStatic = true;
@@ -271,7 +271,7 @@ CObject::ObjectDamage(float amount)
 			PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos);
 			break;
 		}
-		case COLLRESPONSE_SMASH_BARPOST_COMPLETELY: {
+		case DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: {
 			bIsVisible = false;
 			bUsesCollision = false;
 			bIsStatic = true;
diff --git a/src/objects/Object.h b/src/objects/Object.h
index dfaa60db..80b9015c 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -10,19 +10,28 @@ enum {
 	CUTSCENE_OBJECT = 4,
 };
 
-enum {
+enum CollisionSpecialResponseCase
+{
 	COLLRESPONSE_NONE,
-	COLLRESPONSE_CHANGE_MODEL,
-	COLLRESPONSE_SPLIT_MODEL,
-	COLLRESPONSE_SMASH_COMPLETELY,
-	COLLRESPONSE_CHANGE_THEN_SMASH,
-	COLLRESPONSE_UNKNOWN5,
+	COLLRESPONSE_LAMPOST,
+	COLLRESPONSE_SMALLBOX,
+	COLLRESPONSE_BIGBOX,
+	COLLRESPONSE_FENCEPART,
+	COLLRESPONSE_UNKNOWN5
+};
 
-	COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY = 50,
-	COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY = 60,
-	COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY = 70,
-	COLLRESPONSE_SMASH_BARPOST_COMPLETELY = 80,
+enum CollisionDamageEffect
+{
+	DAMAGE_EFFECT_NONE,
+	DAMAGE_EFFECT_CHANGE_MODEL,
+	DAMAGE_EFFECT_SPLIT_MODEL,
+	DAMAGE_EFFECT_SMASH_COMPLETELY,
+	DAMAGE_EFFECT_CHANGE_THEN_SMASH,
 
+	DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY = 50,
+	DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60,
+	DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70,
+	DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80
 };
 
 class CVehicle;