From 175c91308a2fb09b40a602ed9e2dc4860ff7652f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 4 Sep 2022 09:01:57 +0200 Subject: [PATCH] - move BobSin to game side. --- src/common/utility/vectors.h | 6 ------ src/playsim/actorinlines.h | 6 ++++++ src/playsim/mapthinkers/a_floor.cpp | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/common/utility/vectors.h b/src/common/utility/vectors.h index 23452f07b6..c009cb5059 100644 --- a/src/common/utility/vectors.h +++ b/src/common/utility/vectors.h @@ -1366,12 +1366,6 @@ public: } }; -// Emulates the old floatbob offset table with direct calls to trig functions. -inline double BobSin(double fb) -{ - return g_sindeg(double(fb * (180.0 / 32))) * 8; -} - template inline TAngle fabs (const TAngle °) { diff --git a/src/playsim/actorinlines.h b/src/playsim/actorinlines.h index 3fb3676a16..56a2e6ab88 100644 --- a/src/playsim/actorinlines.h +++ b/src/playsim/actorinlines.h @@ -49,6 +49,12 @@ inline double sector_t::LowestFloorAt(AActor *a, sector_t **resultsec) return ::LowestFloorAt(this, a->X(), a->Y(), resultsec); } +// Emulates the old floatbob offset table with direct calls to trig functions. +inline double BobSin(double fb) +{ + return g_sindeg(double(fb * (180.0 / 32))) * 8; +} + inline double AActor::GetBobOffset(double ticfrac) const { if (!(flags2 & MF2_FLOATBOB)) diff --git a/src/playsim/mapthinkers/a_floor.cpp b/src/playsim/mapthinkers/a_floor.cpp index ce2ba59603..3ba08087c6 100644 --- a/src/playsim/mapthinkers/a_floor.cpp +++ b/src/playsim/mapthinkers/a_floor.cpp @@ -41,6 +41,7 @@ #include "g_levellocals.h" #include "vm.h" #include "r_utility.h" +#include "actorinlines.h" //========================================================================== //