From 4876a3145ef65c797d72edebb6f9d6378c3af7dc Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 3 Oct 2023 13:37:34 +1100 Subject: [PATCH] - Move `doslopetilting()` into `DDukePlayer`. --- source/games/duke/src/inlines.h | 5 ----- source/games/duke/src/player_d.cpp | 2 +- source/games/duke/src/player_r.cpp | 2 +- source/games/duke/src/types.h | 13 +++++++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/games/duke/src/inlines.h b/source/games/duke/src/inlines.h index b3fc192b2..a9cf1e863 100644 --- a/source/games/duke/src/inlines.h +++ b/source/games/duke/src/inlines.h @@ -175,11 +175,6 @@ inline bool playrunning() return (paused == 0 || (paused == 1 && (ud.recstat == 2 || ud.multimode > 1))); } -inline void doslopetilting(DDukePlayer* p) -{ - p->Angles.doViewPitch(p->aim_mode == 0 && p->on_ground && p->cursector->lotag != ST_2_UNDERWATER); -} - //--------------------------------------------------------------------------- // // diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index e4144767e..f0d521d20 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -1580,7 +1580,7 @@ void processinput_d(int snum) pact->floorz = floorz; pact->ceilingz = ceilingz; - doslopetilting(p); + p->doslopetilting(); if (chz.type == kHitSprite) { diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 481b06d8a..81d2ee443 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -2347,7 +2347,7 @@ void processinput_r(int snum) pact->floorz = floorz; pact->ceilingz = ceilingz; - doslopetilting(p); + p->doslopetilting(); if (chz.type == kHitSprite) { diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 9addec001..2e6433e0d 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -361,22 +361,22 @@ public: void checkhardlanding(); void playerweaponsway(double xvel); - float adjustavel(float avel) + inline float adjustavel(float avel) { return (psectlotag == ST_2_UNDERWATER)? avel * 0.875f : avel; } - void setCursector(sectortype* sect) + inline void setCursector(sectortype* sect) { cursector = sect; } - bool insector() const + inline bool insector() const { return cursector != nullptr; } - void setbobpos() + inline void setbobpos() { bobpos = GetActor()->spr.pos.XY(); } @@ -399,6 +399,11 @@ public: cmd.ucmd.actions &= ~SB_CENTERVIEW; } } + + inline void doslopetilting() + { + Angles.doViewPitch(aim_mode == 0 && on_ground && cursector->lotag != ST_2_UNDERWATER); + } }; struct Cycler