From 306c0a3ebba6b11700e2394843042a989c6e7fa6 Mon Sep 17 00:00:00 2001 From: Mitch Richters Date: Mon, 1 Nov 2021 23:30:17 +1100 Subject: [PATCH] - `m_fixed.h`: Use `constexpr` on inline functions where it was previously not possible to do so. --- source/common/utility/m_fixed.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/common/utility/m_fixed.h b/source/common/utility/m_fixed.h index 30209d635..e6f5b325f 100644 --- a/source/common/utility/m_fixed.h +++ b/source/common/utility/m_fixed.h @@ -15,7 +15,7 @@ __forceinline constexpr int64_t DivScaleL(int64_t a, int64_t b, int shift) { ret #include "xs_Float.h" -inline fixed_t FloatToFixed(double f) +inline constexpr fixed_t FloatToFixed(double f) { return xs_Fix<16>::ToFix(f); } @@ -32,10 +32,10 @@ inline constexpr double FixedToFloat(fixed_t f) inline constexpr int32_t FixedToInt(fixed_t f) { - return (f + FRACUNIT/2) >> FRACBITS; + return (f + (FRACUNIT >> 1)) >> FRACBITS; } -inline unsigned FloatToAngle(double f) +inline constexpr unsigned FloatToAngle(double f) { return xs_CRoundToInt((f)* (0x40000000 / 90.)); }