From 39fe9efaffc6652993fe2a4708ced8d770d2122a Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Wed, 31 Mar 2021 19:43:41 +1100
Subject: [PATCH] - PlayerAngle: Adjust how `settarget()` methods store angle
 for unsynchronised angle adjustments and adjust `processhelpers()` method
 accordingly.

* Repairs angle issues raised in https://forum.zdoom.org/viewtopic.php?f=340&p=1185365.
---
 source/core/gameinput.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/source/core/gameinput.h b/source/core/gameinput.h
index 357febc07..03c41067b 100644
--- a/source/core/gameinput.h
+++ b/source/core/gameinput.h
@@ -97,9 +97,9 @@ struct PlayerHorizon
 
 struct PlayerAngle
 {
-	binangle ang, oang;
+	binangle ang, oang, target;
 	lookangle look_ang, olook_ang, rotscrnang, orotscrnang, spin;
-	double adjustment, target;
+	double adjustment;
 
 	void backup()
 	{
@@ -172,12 +172,12 @@ struct PlayerAngle
 	{
 		if (!SyncInput() && !backup)
 		{
-			target = (ang + getincanglebam(ang, buildang(value))).asbam();
-			if (target == 0) target += 1;
+			target = buildang(value & 2047);
+			if (target.asbam() == 0) target = bamang(1);
 		}
 		else
 		{
-			ang = buildang(value);
+			ang = buildang(value & 2047);
 			if (backup) oang = ang;
 		}
 	}
@@ -186,12 +186,12 @@ struct PlayerAngle
 	{
 		if (!SyncInput() && !backup)
 		{
-			target = (ang + getincanglebam(ang, buildfang(value))).asbam();
-			if (target == 0) target += 1;
+			target = buildfang(fmod(value, 2048));
+			if (target.asbam() == 0) target = bamang(1);
 		}
 		else
 		{
-			ang = buildfang(value);
+			ang = buildfang(fmod(value, 2048));
 			if (backup) oang = ang;
 		}
 	}
@@ -200,8 +200,8 @@ struct PlayerAngle
 	{
 		if (!SyncInput() && !backup)
 		{
-			target = (ang + getincanglebam(ang, value)).asbam();
-			if (target == 0) target += 1;
+			target = value;
+			if (target.asbam() == 0) target = bamang(1);
 		}
 		else
 		{
@@ -212,14 +212,14 @@ struct PlayerAngle
 
 	void processhelpers(double const scaleAdjust)
 	{
-		if (target)
+		if (target.asbam())
 		{
-			ang += bamang(xs_CRoundToUInt(scaleAdjust * (target - ang.asbam())));
+			ang += bamang(xs_CRoundToUInt(scaleAdjust * getincanglebam(ang, target).asbam()));
 
-			if (abs(ang.asbam() - target) < BAMUNIT)
+			if (getincanglebam(ang, target).asbam() < BAMUNIT)
 			{
-				ang = bamang(target);
-				target = 0;
+				ang = target;
+				target = bamang(0);
 			}
 		}
 		else if (adjustment)