From d58f90de1998d62ed4796f6411c592958b88d335 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Fri, 8 May 2020 11:10:47 +1000
Subject: [PATCH] RR: Properly lock player movement when necessary while in a
 vehicle.

- This makes map follow mode work as expected again.
---
 source/rr/src/player.cpp | 66 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 8 deletions(-)

diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp
index 82fb2d27b..c86db895c 100644
--- a/source/rr/src/player.cpp
+++ b/source/rr/src/player.cpp
@@ -3768,10 +3768,35 @@ void P_GetInputMotorcycle(int playerNum)
         localInput.bits |= buttonMap.ButtonDown(gamefunc_Run) << SK_CROUCH;
     }
 
-    input.q16avel      = fix16_mul(input.q16avel, avelScale);
-    localInput.q16avel = fix16_sadd(localInput.q16avel, input.q16avel);
-    pPlayer->q16ang    = fix16_sadd(pPlayer->q16ang, input.q16avel) & 0x7FFFFFF;
-    localInput.fvel    = clamp((input.fvel += pPlayer->moto_speed), -(MAXVELMOTO / 8), MAXVELMOTO);
+    input.fvel += pPlayer->moto_speed;
+    input.q16avel = fix16_mul(input.q16avel, avelScale);
+
+    int const movementLocked = P_CheckLockedMovement(playerNum);
+
+    if ((ud.scrollmode && ud.overhead_on) || (movementLocked & IL_NOTHING) == IL_NOTHING)
+    {
+        if (ud.scrollmode && ud.overhead_on)
+        {
+            ud.folfvel = input.fvel;
+            ud.folavel = fix16_to_int(input.q16avel);
+        }
+
+        localInput.fvel = localInput.svel = 0;
+        localInput.q16avel = localInput.q16horz = 0;
+    }
+    else
+    {
+        if (!(movementLocked & IL_NOMOVE))
+        {
+            localInput.fvel = clamp(input.fvel, -(MAXVELMOTO / 8), MAXVELMOTO);
+        }
+
+        if (!(movementLocked & IL_NOANGLE))
+        {
+            localInput.q16avel = fix16_sadd(localInput.q16avel, input.q16avel);
+            pPlayer->q16ang    = fix16_sadd(pPlayer->q16ang, input.q16avel) & 0x7FFFFFF;
+        }
+    }
 
     if (TEST_SYNC_KEY(localInput.bits, SK_JUMP))
     {
@@ -3952,10 +3977,35 @@ void P_GetInputBoat(int playerNum)
             pPlayer->tilt_status++;
     }
 
-    input.q16avel      = fix16_mul(input.q16avel, avelScale);
-    localInput.q16avel = fix16_sadd(localInput.q16avel, input.q16avel);
-    pPlayer->q16ang    = fix16_sadd(pPlayer->q16ang, input.q16avel) & 0x7FFFFFF;
-    localInput.fvel    = clamp((input.fvel += pPlayer->moto_speed), -(MAXVELMOTO / 8), MAXVELMOTO);
+    input.fvel += pPlayer->moto_speed;
+    input.q16avel = fix16_mul(input.q16avel, avelScale);
+
+    int const movementLocked = P_CheckLockedMovement(playerNum);
+
+    if ((ud.scrollmode && ud.overhead_on) || (movementLocked & IL_NOTHING) == IL_NOTHING)
+    {
+        if (ud.scrollmode && ud.overhead_on)
+        {
+            ud.folfvel = input.fvel;
+            ud.folavel = fix16_to_int(input.q16avel);
+        }
+
+        localInput.fvel = localInput.svel = 0;
+        localInput.q16avel = localInput.q16horz = 0;
+    }
+    else
+    {
+        if (!(movementLocked & IL_NOMOVE))
+        {
+            localInput.fvel = clamp(input.fvel, -(MAXVELMOTO / 8), MAXVELMOTO);
+        }
+
+        if (!(movementLocked & IL_NOANGLE))
+        {
+            localInput.q16avel = fix16_sadd(localInput.q16avel, input.q16avel);
+            pPlayer->q16ang    = fix16_sadd(pPlayer->q16ang, input.q16avel) & 0x7FFFFFF;
+        }
+    }
 }
 
 int dword_A99D4, dword_A99D8, dword_A99DC, dword_A99E0;