1 files changed, 22 insertions, 24 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 319ec4bc..79589dc9 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -10,31 +10,28 @@ enum {
 	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 CollisionSpecialResponseCase
+{
 	COLLRESPONSE_NONE,
-	COLLRESPONSE_CHANGE_MODEL,
-	COLLRESPONSE_SPLIT_MODEL,
-	COLLRESPONSE_SMASH_COMPLETELY,
-	COLLRESPONSE_CHANGE_THEN_SMASH,
-	COLLRESPONSE_UNKNOWN5,
-
-	COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY = 50,
-	COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY = 60,
-	COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY = 70,
-	COLLRESPONSE_SMASH_BARPOST_COMPLETELY = 80,
+	COLLRESPONSE_LAMPOST,
+	COLLRESPONSE_SMALLBOX,
+	COLLRESPONSE_BIGBOX,
+	COLLRESPONSE_FENCEPART,
+	COLLRESPONSE_UNKNOWN5
+};
 
+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;
@@ -100,4 +97,5 @@ public:
 	static void DeleteAllTempObjects();
 	static void DeleteAllTempObjectsInArea(CVector point, float fRadius);
 };
-static_assert(sizeof(CObject) == 0x198, "CObject: error");
+
+VALIDATE_SIZE(CObject, 0x198);