From 2e27b3ea87cdc870774a1cbe068494d9a1df233d Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 30 Mar 2020 19:58:46 +0100
Subject: [PATCH] Turn the fixed-float convert macros into inline functions,
like those in GZDoom. The old macros get to be just the same as calling these
inline functions.
---
src/m_fixed.h | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/m_fixed.h b/src/m_fixed.h
index 7fdb9ad0a0..49e7cc096f 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -38,8 +38,20 @@ typedef INT32 fixed_t;
/*!
\brief convert fixed_t into floating number
*/
-#define FIXED_TO_FLOAT(x) (((float)(x)) / ((float)FRACUNIT))
-#define FLOAT_TO_FIXED(f) (fixed_t)((f) * ((float)FRACUNIT))
+
+FUNCMATH FUNCINLINE static inline float FixedToFloat(fixed_t x)
+{
+ return x / (float)FRACUNIT;
+}
+
+FUNCMATH FUNCINLINE static inline fixed_t FloatToFixed(float f)
+{
+ return (fixed_t)(f * FRACUNIT);
+}
+
+// for backwards compat
+#define FIXED_TO_FLOAT(x) FixedToFloat(x) // (((float)(x)) / ((float)FRACUNIT))
+#define FLOAT_TO_FIXED(f) FloatToFixed(f) // (fixed_t)((f) * ((float)FRACUNIT))
#if defined (__WATCOMC__) && FRACBITS == 16
--
GitLab