From 85f716e49ba60ae6243d9c6cba408de8db5cef5b Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 27 Sep 2022 15:51:42 +1000
Subject: [PATCH] - floatify calcviewpitch

---
 source/core/gameinput.cpp | 16 +++++++---------
 source/core/gameinput.h   | 12 +-----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
index 891a47a5f..91a74670b 100644
--- a/source/core/gameinput.cpp
+++ b/source/core/gameinput.cpp
@@ -395,34 +395,32 @@ enum
 	BLOODVIEWPITCH = (0x4000 >> SINSHIFTDELTA) - (DEFVIEWPITCH << (SINSHIFTDELTA - 1)), // 1408.
 };
 
-void PlayerHorizon::calcviewpitch(vec2_t const pos, DAngle const ang, bool const aimmode, bool const canslopetilt, sectortype* const cursectnum, double const scaleAdjust, bool const climbing)
+void PlayerHorizon::calcviewpitch(const DVector2& pos, DAngle const ang, bool const aimmode, bool const canslopetilt, sectortype* const cursectnum, double const scaleAdjust, bool const climbing)
 {
 	if (cl_slopetilting && cursectnum != nullptr)
 	{
 		if (aimmode && canslopetilt) // If the floor is sloped
 		{
 			// Get a point, 512 (64 for Blood) units ahead of player's position
-			int const shift = isBlood() ? BLOODSINSHIFT : DEFSINSHIFT;
-			int const x = pos.X + int(ang.Cos() * (1 << (BUILDSINBITS - shift)));
-			int const y = pos.Y + int(ang.Sin() * (1 << (BUILDSINBITS - shift)));
+			auto rotpt = pos + ang.ToVector() * (isBlood() ? 4 : 32);
 			auto tempsect = cursectnum;
-			updatesector(x, y, &tempsect);
+			updatesector(rotpt, &tempsect);
 
 			if (tempsect != nullptr) // If the new point is inside a valid sector...
 			{
 				// Get the floorz as if the new (x,y) point was still in
 				// your sector
-				int const j = getflorzofslopeptr(cursectnum, pos.X, pos.Y);
-				int const k = getflorzofslopeptr(tempsect, x, y);
+				double const j = getflorzofslopeptrf(cursectnum, pos);
+				double const k = getflorzofslopeptrf(tempsect, rotpt);
 
 				// If extended point is in same sector as you or the slopes
 				// of the sector of the extended point and your sector match
 				// closely (to avoid accidently looking straight out when
 				// you're at the edge of a sector line) then adjust horizon
 				// accordingly
-				if (cursectnum == tempsect || (!isBlood() && abs(getflorzofslopeptr(tempsect, x, y) - k) <= (4 << 8)))
+				if (cursectnum == tempsect || (!isBlood() && abs(getflorzofslopeptrf(tempsect, rotpt) - k) <= 4))
 				{
-					horizoff += q16horiz(fixed_t(scaleAdjust * ((j - k) * (!isBlood() ? DEFVIEWPITCH : BLOODVIEWPITCH))));
+					horizoff += q16horiz(fixed_t(scaleAdjust * ((j - k) * 256 * (!isBlood() ? DEFVIEWPITCH : BLOODVIEWPITCH))));
 				}
 			}
 		}
diff --git a/source/core/gameinput.h b/source/core/gameinput.h
index a858b01bf..8968e75a1 100644
--- a/source/core/gameinput.h
+++ b/source/core/gameinput.h
@@ -15,17 +15,7 @@ struct PlayerHorizon
 
 	// Prototypes for functions in gameinput.cpp.
 	void applyinput(float const horz, ESyncBits* actions, double const scaleAdjust = 1);
-	void calcviewpitch(vec2_t const pos, DAngle const ang, bool const aimmode, bool const canslopetilt, sectortype* const cursectnum, double const scaleAdjust = 1, bool const climbing = false);
-	void calcviewpitch(const DVector2& pos, DAngle const ang, bool const aimmode, bool const canslopetilt, sectortype* const cursectnum, double const scaleAdjust = 1, bool const climbing = false)
-	{
-		vec2_t ps = { int(pos.X * worldtoint), int(pos.Y * worldtoint) };
-		calcviewpitch(ps, ang, aimmode, canslopetilt, cursectnum, scaleAdjust, climbing);
-	}
-	void calcviewpitch(const DVector3& pos, DAngle const ang, bool const aimmode, bool const canslopetilt, sectortype* const cursectnum, double const scaleAdjust = 1, bool const climbing = false)
-	{
-		vec2_t ps = { int(pos.X * worldtoint), int(pos.Y * worldtoint) };
-		calcviewpitch(ps, ang, aimmode, canslopetilt, cursectnum, scaleAdjust, climbing);
-	}
+	void calcviewpitch(const DVector2& pos, DAngle const ang, bool const aimmode, bool const canslopetilt, sectortype* const cursectnum, double const scaleAdjust = 1, bool const climbing = false);
 
 	// Interpolation helpers.
 	void backup()