From 8b801921a464eebfba97fb7dd9d3421d17f446fe Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Mon, 18 May 2020 11:29:56 -0500
Subject: [PATCH] Deprecate FixedRem.
It's about time!
---
src/lua_mathlib.c | 3 ++-
src/m_fixed.h | 12 ------------
src/tables.c | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index 2159032781..794f90f1fe 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -113,7 +113,8 @@ static int lib_fixeddiv(lua_State *L)
static int lib_fixedrem(lua_State *L)
{
- lua_pushfixed(L, FixedRem(luaL_checkfixed(L, 1), luaL_checkfixed(L, 2)));
+ LUA_Deprecated(L, "FixedRem(a, b)", "a % b");
+ lua_pushfixed(L, luaL_checkfixed(L, 1) % luaL_checkfixed(L, 2));
return 1;
}
diff --git a/src/m_fixed.h b/src/m_fixed.h
index cc54c1aea2..289ca442a0 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -204,18 +204,6 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedDiv(fixed_t a, fixed_t b)
return FixedDiv2(a, b);
}
-/** \brief The FixedRem function
-
- \param x fixed_t number
- \param y fixed_t number
-
- \return remainder of dividing x by y
-*/
-FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRem(fixed_t x, fixed_t y)
-{
- return x % y;
-}
-
/** \brief The FixedSqrt function
\param x fixed_t number
diff --git a/src/tables.c b/src/tables.c
index 00424db22a..70a1ecd0ad 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -72,7 +72,7 @@ static FUNCMATH angle_t AngleAdj(const fixed_t fa, const fixed_t wf,
const angle_t adj = 0x77;
const boolean fan = fa < 0;
const fixed_t sl = FixedDiv(fa, wf*2);
- const fixed_t lb = FixedRem(fa, wf*2);
+ const fixed_t lb = fa % (wf*2);
const fixed_t lo = (wf*2)-lb;
if (ra == 0)
--
GitLab