From 0c9b65258336f37a73c7b7fc57172e17d6800348 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 12 Aug 2023 09:38:41 +0200 Subject: [PATCH] - moved EStateUseFlags to a more fitting header and deleted unused RAD2BAM inlines --- src/common/scripting/core/symbols.h | 10 ++++++++++ src/common/utility/basics.h | 19 ------------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/common/scripting/core/symbols.h b/src/common/scripting/core/symbols.h index de5caaae9..15d547f7d 100644 --- a/src/common/scripting/core/symbols.h +++ b/src/common/scripting/core/symbols.h @@ -9,6 +9,16 @@ class PPrototype; struct ZCC_TreeNode; class PContainerType; +// This is needed in common code, despite being Doom specific. +enum EStateUseFlags +{ + SUF_ACTOR = 1, + SUF_OVERLAY = 2, + SUF_WEAPON = 4, + SUF_ITEM = 8, +}; + + // Symbol information ------------------------------------------------------- class PTypeBase diff --git a/src/common/utility/basics.h b/src/common/utility/basics.h index 2429e3cf2..796c38247 100644 --- a/src/common/utility/basics.h +++ b/src/common/utility/basics.h @@ -96,25 +96,6 @@ inline double RAD2DEG(double rad) return rad * (180. / M_PI); } -inline angle_t RAD2BAM(float rad) -{ - return angle_t(xs_RoundToUInt(rad * float(0x80000000u / M_PI))); -} - -inline angle_t RAD2BAM(double rad) -{ - return angle_t(xs_RoundToUInt(rad * (0x80000000u / M_PI))); -} - - -// This is needed in common code, despite being Doom specific. -enum EStateUseFlags -{ - SUF_ACTOR = 1, - SUF_OVERLAY = 2, - SUF_WEAPON = 4, - SUF_ITEM = 8, -}; using std::min; using std::max;