From 60a36f4902029bdf543e31f31d7b4335d8b8c1c6 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 3 Oct 2023 14:56:07 +0200
Subject: [PATCH] fix Vectoe3 clamp for real.

---
 source/common/utility/vectors.h | 3 ++-
 source/core/gameinput.cpp       | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/common/utility/vectors.h b/source/common/utility/vectors.h
index 192eb90a8..1489ef568 100644
--- a/source/common/utility/vectors.h
+++ b/source/common/utility/vectors.h
@@ -44,6 +44,7 @@
 #include <math.h>
 #include <float.h>
 #include <string.h>
+#include <algorithm>
 
 // this is needed to properly normalize angles. We cannot do that with compiler provided conversions because they differ too much
 #include "xs_Float.h"
@@ -1543,7 +1544,7 @@ inline TVector2<T> clamp(const TVector2<T> &vec, const TVector2<T> &min, const T
 template<class T>
 inline TVector3<T> clamp(const TVector3<T> &vec, const TVector3<T> &min, const TVector3<T> &max)
 {
-	return TVector3<T>(clamp(vec.X, min.X, max.X), clamp(vec.Y, min.Y, max.Y), clamp(vec.Z, min.Z, max.Z));
+	return TVector3<T>(std::clamp<T>(vec.X, min.X, max.X), std::clamp<T>(vec.Y, min.Y, max.Y), std::clamp<T>(vec.Z, min.Z, max.Z));
 }
 
 template<class T>
diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
index f28ab3809..eb9d41a93 100644
--- a/source/core/gameinput.cpp
+++ b/source/core/gameinput.cpp
@@ -169,9 +169,7 @@ void GameInput::processMovement(PlayerAngles* const plrAngles, const double scal
 	// add collected input to game's local input accumulation packet.
 	const DVector3 maxVel{ (double)keymove, (double)keymove, 1. };
 	const DRotator maxAng{ MAXANG, MAXANG, MAXANG };
-	inputBuffer.vel.X = clamp(inputBuffer.vel.X + thisInput.vel.X, -(double)keymove, (double)keymove);
-	inputBuffer.vel.Y = clamp(inputBuffer.vel.Y + thisInput.vel.Y, -(double)keymove, (double)keymove);
-	inputBuffer.vel.Z = clamp(inputBuffer.vel.Z + thisInput.vel.Z, -1., 1.);
+	inputBuffer.vel = clamp(inputBuffer.vel + thisInput.vel, -maxVel, maxVel);
 	inputBuffer.ang = clamp(inputBuffer.ang + thisInput.ang, -maxAng, maxAng);
 
 	// directly update player angles if we can.