From f53e9cb5fcfc636985cfe937f72422d451f801a3 Mon Sep 17 00:00:00 2001 From: Chronos Ouroboros Date: Sat, 14 Nov 2020 14:53:43 -0300 Subject: [PATCH] Fixed the previous commit not accounting for mods that already fixed this internally. --- src/d_player.h | 1 - src/p_user.cpp | 4 +--- wadsrc/static/zscript/actors/player/player.zs | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 2f2b1ca1f..3dcfaafe8 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -310,7 +310,6 @@ public: double viewz = 0; // focal origin above r.z double viewheight = 0; // base height above floor for viewz double deltaviewheight = 0; // squat speed. - float prevbob = 0; // Previous value of "bob" double bob = 0; // bounded/scaled total velocity // killough 10/98: used for realistic bobbing (i.e. not simply overall speed) diff --git a/src/p_user.cpp b/src/p_user.cpp index d5f5d75c9..1326791a2 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -356,7 +356,6 @@ void player_t::CopyFrom(player_t &p, bool copyPSP) viewz = p.viewz; viewheight = p.viewheight; deltaviewheight = p.deltaviewheight; - prevbob = p.prevbob; bob = p.bob; Vel = p.Vel; centering = p.centering; @@ -1323,7 +1322,7 @@ void P_PlayerThink (player_t *player) player->original_cmd = cmd->ucmd; // Don't interpolate the view for more than one tic player->cheats &= ~CF_INTERPVIEW; - player->prevbob = player->bob; + player->mo->FloatVar("prevBob") = player->bob; IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, PlayerThink) { @@ -1795,7 +1794,6 @@ DEFINE_FIELD_X(PlayerInfo, player_t, FOV) DEFINE_FIELD_X(PlayerInfo, player_t, viewz) DEFINE_FIELD_X(PlayerInfo, player_t, viewheight) DEFINE_FIELD_X(PlayerInfo, player_t, deltaviewheight) -DEFINE_FIELD_X(PlayerInfo, player_t, prevbob) DEFINE_FIELD_X(PlayerInfo, player_t, bob) DEFINE_FIELD_X(PlayerInfo, player_t, Vel) DEFINE_FIELD_X(PlayerInfo, player_t, centering) diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs index 970e60d5c..19a80c50a 100644 --- a/wadsrc/static/zscript/actors/player/player.zs +++ b/wadsrc/static/zscript/actors/player/player.zs @@ -49,6 +49,7 @@ class PlayerPawn : Actor double ViewBob; // [SP] ViewBob Multiplier double FullHeight; double curBob; + double prevBob; meta Name HealingRadiusType; meta Name InvulMode; @@ -2368,7 +2369,7 @@ class PlayerPawn : Actor double bobVal = player.bob; if (i == 0) { - bobVal = player.prevBob; + bobVal = prevBob; } //[SP] Added in decorate player.viewbob checks double bobx = (bobVal * BobIntensity * Rangex * ViewBob); @@ -2644,7 +2645,6 @@ struct PlayerInfo native play // self is what internally is known as player_t native double viewz; native double viewheight; native double deltaviewheight; - native float prevbob; native double bob; native vector2 vel; native bool centering;