From a2b89c6a18d43910e9626c23793a4935e2c0d08d Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Wed, 6 May 2020 17:13:46 +0200
Subject: sorted out object collision enums

---
 src/entities/Physical.cpp |  4 ++--
 src/objects/Object.cpp    | 16 ++++++++--------
 src/objects/Object.h      | 29 +++++++++++++++++++----------
 src/peds/Ped.cpp          |  4 ++--
 4 files changed, 31 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index dd49ea3e..790a8be7 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1847,7 +1847,7 @@ CPhysical::ProcessCollision(void)
 		step = savedTimeStep / n;
 	}else if(IsObject()){
 		int responsecase = ((CObject*)this)->m_nSpecialCollisionResponseCases;
-		if(responsecase == COLLRESPONSE_CHANGE_MODEL){
+		if(responsecase == COLLRESPONSE_LAMPOST){
 			CVector speedUp = { 0.0f, 0.0f, 0.0f };
 			CVector speedDown = { 0.0f, 0.0f, 0.0f };
 			speedUp.z = GetBoundRadius();
@@ -1866,7 +1866,7 @@ CPhysical::ProcessCollision(void)
 				n = NUMSTEPS(0.09f);
 				step = savedTimeStep / n;
 			}
-		}else if(responsecase == COLLRESPONSE_SPLIT_MODEL || responsecase == COLLRESPONSE_CHANGE_THEN_SMASH){
+		}else if(responsecase == COLLRESPONSE_SMALLBOX || responsecase == COLLRESPONSE_FENCEPART){
 			if(distSq >= sq(0.15f)){
 				n = NUMSTEPS(0.15f);
 				step = savedTimeStep / n;
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index a450ca56..cd2cd688 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 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;
@@ -186,7 +186,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;
 			}
@@ -199,7 +199,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;
@@ -222,7 +222,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;
@@ -245,7 +245,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;
@@ -270,7 +270,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;
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 56a18dab..6be4b3d7 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -9551,7 +9551,7 @@ CPed::ProcessControl(void)
 				{
 					CBaseModelInfo *collidingModel = CModelInfo::GetModelInfo(collidingEnt->GetModelIndex());
 					CColModel *collidingCol = collidingModel->GetColModel();
-					if (collidingEnt->IsObject() && ((CObject*)collidingEnt)->m_nSpecialCollisionResponseCases != COLLRESPONSE_CHANGE_THEN_SMASH
+					if (collidingEnt->IsObject() && ((CObject*)collidingEnt)->m_nSpecialCollisionResponseCases != COLLRESPONSE_FENCEPART
 						|| collidingCol->boundingBox.max.x < 3.0f
 						&& collidingCol->boundingBox.max.y < 3.0f) {
 
@@ -16934,7 +16934,7 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
 	obj->ObjectCreatedBy = TEMP_OBJECT;
 	obj->bIsStatic = false;
 	obj->bIsPickup = false;
-	obj->m_nSpecialCollisionResponseCases = COLLRESPONSE_SPLIT_MODEL;
+	obj->m_nSpecialCollisionResponseCases = COLLRESPONSE_SMALLBOX;
 
 	// life time - the more objects the are, the shorter this one will live
 	CObject::nNoTempObjects++;
-- 
cgit v1.2.3