From 274899c9dbc40de52d379f08824e5bd1155bef2e Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Mon, 7 Nov 2022 17:31:17 +1100
Subject: [PATCH] - Get rid of useless `lerp()` function I added last night for
 lack of C++20.

* We already have a generic linear interpolator that _I_ added, so let's use it.
---
 source/common/utility/cmdlib.h        | 15 +++------------
 source/games/blood/src/view.cpp       |  2 +-
 source/games/duke/src/hudweapon_d.cpp |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/source/common/utility/cmdlib.h b/source/common/utility/cmdlib.h
index eb76450eb..392d0f46d 100644
--- a/source/common/utility/cmdlib.h
+++ b/source/common/utility/cmdlib.h
@@ -90,18 +90,6 @@ inline constexpr double Scale(double a, double b, double c)
 	return (a * b) / c;
 }
 
-template<typename T>
-inline constexpr int Sgn(const T& val)
-{
-	return (val > 0) - (val < 0);
-}
-
-template<typename T>
-inline constexpr T lerp(const T min, const T max, const T input)
-{
-	return (T(1) - input) * min + input * max;
-}
-
 class FileReader;
 struct MD5Context;
 
@@ -117,6 +105,9 @@ inline void fillshort(void* buff, size_t count, uint16_t clear)
 	}
 }
 
+template<typename T> inline constexpr int Sgn(const T& val) { return (val > 0) - (val < 0); }
+
+
 inline int sizeToBits(int w)
 {
 	int j = 15;
diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp
index 79a17ea9f..ebe797c70 100644
--- a/source/games/blood/src/view.cpp
+++ b/source/games/blood/src/view.cpp
@@ -526,7 +526,7 @@ static void SetupView(PLAYER* pPlayer, DVector3& cPos, DAngle& cA, DAngle& cH, s
 		{
 			cPos.Z += bobHeight;
 		}
-		cPos.Z -= lerp(-10., 10., (cH + DAngle90) / DAngle180);
+		cPos.Z -= interpolatedvalue(-10., 10., (cH + DAngle90) / DAngle180);
 	}
 	else
 	{
diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp
index f936a05ec..5837270ba 100644
--- a/source/games/duke/src/hudweapon_d.cpp
+++ b/source/games/duke/src/hudweapon_d.cpp
@@ -232,7 +232,7 @@ void displayweapon_d(int snum, double interpfrac)
 
 	plravel = getavel(snum) * (1. / 16.);
 	auto horiz = !SyncInput() ? p->horizon.sum() : p->horizon.interpolatedsum(interpfrac);
-	horiz16th = lerp(-16., 16., (horiz + DAngle90) / DAngle180);
+	horiz16th = interpolatedvalue(-16., 16., (horiz + DAngle90) / DAngle180);
 	look_anghalf = p->angle.look_anghalf(interpfrac);
 	looking_arc = p->angle.looking_arc(interpfrac);
 	hard_landing *= 8.;