From 6ef8ddf3eef1bb7c790e87f301d776458e6235f8 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Thu, 23 Dec 2021 23:15:36 -0500
Subject: [PATCH] Let's just convert this in a more sane fashion...

---
 src/k_terrain.c |  4 ++--
 src/tables.c    | 10 ++++++++++
 src/tables.h    |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/k_terrain.c b/src/k_terrain.c
index b50fead33..da5a93f90 100644
--- a/src/k_terrain.c
+++ b/src/k_terrain.c
@@ -838,7 +838,7 @@ static void K_ParseSplashParameter(size_t i, char *param, char *val)
 	}
 	else if (stricmp(param, "cone") == 0)
 	{
-		splash->cone = AngleFixed(FLOAT_TO_FIXED(atof(val))); // lol
+		splash->cone = FloatToAngle(atof(val));
 	}
 	else if (stricmp(param, "numParticles") == 0)
 	{
@@ -938,7 +938,7 @@ static void K_ParseFootstepParameter(size_t i, char *param, char *val)
 	}
 	else if (stricmp(param, "cone") == 0)
 	{
-		footstep->cone = AngleFixed(FLOAT_TO_FIXED(atof(val))); // lol
+		footstep->cone = FloatToAngle(atof(val));
 	}
 	else if (stricmp(param, "sfxFreq") == 0)
 	{
diff --git a/src/tables.c b/src/tables.c
index 42ad6a73c..8c4dc50e1 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -185,6 +185,16 @@ INT32 AngleDeltaSigned(angle_t a1, angle_t a2)
 	return (INT32)(a1) - (INT32)(a2);
 }
 
+float AngleToFloat(angle_t x)
+{
+	return x / (float)ANG1;
+}
+
+angle_t FloatToAngle(float f)
+{
+	return (angle_t)(f * ANG1);
+}
+
 #include "t_ftan.c"
 
 #include "t_fsin.c"
diff --git a/src/tables.h b/src/tables.h
index 5e5b6e57b..e122975e1 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -108,6 +108,8 @@ FUNCMATH angle_t FixedAngleC(fixed_t fa, fixed_t factor);
 // difference between two angle_t
 FUNCMATH INT32 AngleDelta(angle_t a1, angle_t a2);
 FUNCMATH INT32 AngleDeltaSigned(angle_t a1, angle_t a2);
+FUNCMATH float AngleToFloat(angle_t x);
+FUNCMATH angle_t FloatToAngle(float f);
 
 /// The FixedAcos function
 FUNCMATH angle_t FixedAcos(fixed_t x);