From 82d029fe2818a731d8287550cf73d6733bf1fa73 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 3 Oct 2023 14:53:27 +1100
Subject: [PATCH] - Duke: Restore underwater input scaling to unsynchronised
 input which was lost back in March
 (`b3c27a177e4787bf9341973039e73c1403e1b230`).

---
 source/games/duke/src/input.cpp    | 4 ++--
 source/games/duke/src/player_d.cpp | 4 ----
 source/games/duke/src/player_r.cpp | 4 ----
 source/games/duke/src/types.h      | 5 -----
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/source/games/duke/src/input.cpp b/source/games/duke/src/input.cpp
index 1feaa8b3e..660042b3f 100644
--- a/source/games/duke/src/input.cpp
+++ b/source/games/duke/src/input.cpp
@@ -511,7 +511,7 @@ unsigned GameInterface::getCrouchState()
 
 void GameInterface::doPlayerMovement(const float scaleAdjust)
 {
-	auto const p = getPlayer(myconnectindex);
+	const auto p = getPlayer(myconnectindex);
 
 	if (isRRRA() && (p->OnMotorcycle || p->OnBoat))
 	{
@@ -535,7 +535,7 @@ void GameInterface::doPlayerMovement(const float scaleAdjust)
 	}
 	else
 	{
-		gameInput.processMovement(&p->Angles, scaleAdjust, p->drink_amt);
+		gameInput.processMovement(&p->Angles, scaleAdjust, p->drink_amt, true, (p->psectlotag != ST_2_UNDERWATER) ? 1.f : 0.875f);
 	}
 }
 
diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index f0d521d20..c29a1cf01 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -1717,10 +1717,6 @@ void processinput_d(int snum)
 		p->cmd.ucmd.avel = 0;
 		setForcedSyncInput(snum);
 	}
-	else
-	{
-		p->cmd.ucmd.avel = p->adjustavel(PlayerInputAngVel(snum));
-	}
 
 	p->Angles.doYawInput(&p->cmd.ucmd);
 
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index 81d2ee443..2f5fb3870 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -2544,10 +2544,6 @@ void processinput_r(int snum)
 		p->cmd.ucmd.avel = 0;
 		setForcedSyncInput(snum);
 	}
-	else
-	{
-		p->cmd.ucmd.avel = p->adjustavel(PlayerInputAngVel(snum));
-	}
 
 	p->Angles.doYawInput(&p->cmd.ucmd);
 
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index 2e6433e0d..1676da46b 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -361,11 +361,6 @@ public:
 	void checkhardlanding();
 	void playerweaponsway(double xvel);
 
-	inline float adjustavel(float avel)
-	{
-		return (psectlotag == ST_2_UNDERWATER)? avel * 0.875f : avel;
-	}
-
 	inline void setCursector(sectortype* sect)
 	{
 		cursector = sect;