From 893d8cd211e80a0e828d02727b7407feeaa69acf Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Fri, 5 Jul 2019 21:11:13 +0100
Subject: [PATCH] Support Jawz dud on slopes Don't let orbinaut accelerate
 infinitely when in the air.

---
 src/p_mobj.c | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 470615101..6af652028 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1937,7 +1937,7 @@ void P_XYMovement(mobj_t *mo)
 #endif
 
 	//{ SRB2kart stuff
-	if (mo->type == MT_JAWZ_DUD || mo->type == MT_JAWZ || mo->type == MT_BALLHOG || mo->type == MT_FLINGRING) //(mo->type == MT_JAWZ && !mo->tracer))
+	if (mo->type == MT_JAWZ || mo->type == MT_BALLHOG || mo->type == MT_FLINGRING) //(mo->type == MT_JAWZ && !mo->tracer))
 		return;
 
 	if (mo->player && (mo->player->kartstuff[k_spinouttimer] && !mo->player->kartstuff[k_wipeoutslow]) && mo->player->speed <= K_GetKartSpeed(mo->player, false)/2)
@@ -7937,9 +7937,16 @@ void P_MobjThinker(mobj_t *mobj)
 				fixed_t finalspeed = mobj->movefactor;
 				const fixed_t currentspeed = R_PointToDist2(0, 0, mobj->momx, mobj->momy);
 				fixed_t thrustamount = 0;
+				fixed_t frictionsafety = (mobj->friction == 0) ? 1 : mobj->friction;
 				mobj_t *ghost = P_SpawnGhostMobj(mobj);
 				ghost->colorized = true; // already has color!
 
+				if (!grounded)
+				{
+					// No friction in the air
+					frictionsafety = FRACUNIT;
+				}
+
 				mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
 				if (mobj->health <= 5)
 				{
@@ -7950,23 +7957,19 @@ void P_MobjThinker(mobj_t *mobj)
 
 				if (currentspeed >= finalspeed)
 				{
-					const fixed_t frictionsafety = (mobj->friction == 0) ? 1 : mobj->friction;
+
 					// Thrust as if you were at top speed, slow down naturally
 					thrustamount = FixedDiv(finalspeed, frictionsafety) - finalspeed;
 				}
 				else
 				{
-					const fixed_t frictionsafety = (mobj->friction == 0) ? 1 : mobj->friction;
 					const fixed_t beatfriction = FixedDiv(currentspeed, frictionsafety) - currentspeed;
 					// Thrust to immediately get to top speed
 					thrustamount = beatfriction + FixedDiv(finalspeed - currentspeed, frictionsafety);
 				}
 
-
 				P_Thrust(mobj, mobj->angle, thrustamount);
 
-
-
 				if (grounded)
 				{
 					sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj);
@@ -8061,6 +8064,9 @@ void P_MobjThinker(mobj_t *mobj)
 			else
 			{
 				mobj_t *ghost = P_SpawnGhostMobj(mobj);
+				const fixed_t currentspeed = R_PointToDist2(0, 0, mobj->momx, mobj->momy);
+				fixed_t frictionsafety = (mobj->friction == 0) ? 1 : mobj->friction;
+				fixed_t thrustamount = 0;
 
 				if (mobj->target && !P_MobjWasRemoved(mobj->target) && mobj->target->player)
 				{
@@ -8068,8 +8074,26 @@ void P_MobjThinker(mobj_t *mobj)
 					ghost->colorized = true;
 				}
 
+				if (!grounded)
+				{
+					// No friction in the air
+					frictionsafety = FRACUNIT;
+				}
+
+				if (currentspeed >= mobj->movefactor)
+				{
+					// Thrust as if you were at top speed, slow down naturally
+					thrustamount = FixedDiv(mobj->movefactor, frictionsafety) - mobj->movefactor;
+				}
+				else
+				{
+					const fixed_t beatfriction = FixedDiv(currentspeed, frictionsafety) - currentspeed;
+					// Thrust to immediately get to top speed
+					thrustamount = beatfriction + FixedDiv(mobj->movefactor - currentspeed, frictionsafety);
+				}
+
 				mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
-				P_InstaThrust(mobj, mobj->angle, mobj->movefactor);
+				P_Thrust(mobj, mobj->angle, thrustamount);
 
 				if (grounded)
 				{
@@ -9459,7 +9483,8 @@ for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) s
 		|| mobj->type == MT_LITTLETUMBLEWEED
 		|| mobj->type == MT_CANNONBALLDECOR
 		|| mobj->type == MT_FALLINGROCK
-		|| mobj->type == MT_ORBINAUT) {
+		|| mobj->type == MT_ORBINAUT
+		|| mobj->type == MT_JAWZ_DUD) {
 		P_TryMove(mobj, mobj->x, mobj->y, true); // Sets mo->standingslope correctly
 		//if (mobj->standingslope) CONS_Printf("slope physics on mobj\n");
 		P_ButteredSlope(mobj);