From afe70003f4c48683c287ca3d16662cc710f8602e Mon Sep 17 00:00:00 2001
From: "Walied K. Yassen" <walied.developer@hotmail.com>
Date: Sun, 29 Nov 2020 08:52:43 +0200
Subject: [PATCH] Fix MI_RCBOMB gravity force and treat MI_PETROLPUMP2 as
 explosive

---
 src/objects/Object.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 2319c0d9..9322418f 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -107,7 +107,8 @@ CObject::ProcessControl(void)
 		m_vecMoveSpeed *= fTimeStep;
 		m_vecTurnSpeed *= fTimeStep;
 	}
-	if ((GetModelIndex() == MI_EXPLODINGBARREL || GetModelIndex() == MI_PETROLPUMP) && bHasBeenDamaged && bIsVisible
+	auto mi = GetModelIndex();
+	if ((mi == MI_EXPLODINGBARREL || mi == MI_PETROLPUMP || mi == MI_PETROLPUMP2) && bHasBeenDamaged && bIsVisible
 		&& (CGeneral::GetRandomNumber() & 0x1F) == 10) {
 		bExplosionProof = true;
 		bIsVisible = false;
@@ -115,6 +116,13 @@ CObject::ProcessControl(void)
 		bAffectedByGravity = false;
 		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
 	}
+	if (mi == MI_RCBOMB) {
+		float fTurnForce = -(m_fTurnMass / 20.0f);
+		CPhysical::ApplyTurnForce(m_vecMoveSpeed * fTurnForce, -GetForward());     
+		float fScalar = 1.0f - m_vecMoveSpeed.MagnitudeSqr() / 5.0f;
+		float fScalarTimed = Pow(fScalar, CTimer::GetTimeStep());
+		m_vecMoveSpeed *= fScalarTimed;
+	}
 }
 
 void