zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 06:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the previous commit not accounting for mods that already fixed this internally.

Browse source
This commit is contained in:
Chronos Ouroboros 2020-11-14 14:53:43 -03:00
parent 0aefc61f86
commit 75c791ecff
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/playsim/d_player.h
View file

@ -310,7 +310,6 @@ public:
double viewz = 0; // focal origin above r.z double viewz = 0; // focal origin above r.z
double viewheight = 0; // base height above floor for viewz double viewheight = 0; // base height above floor for viewz
double deltaviewheight = 0; // squat speed. double deltaviewheight = 0; // squat speed.
float prevbob = 0; // Previous value of "bob"
double bob = 0; // bounded/scaled total velocity double bob = 0; // bounded/scaled total velocity
// killough 10/98: used for realistic bobbing (i.e. not simply overall speed) // killough 10/98: used for realistic bobbing (i.e. not simply overall speed)

4
src/playsim/p_user.cpp
View file

@ -275,7 +275,6 @@ void player_t::CopyFrom(player_t &p, bool copyPSP)
viewz = p.viewz; viewz = p.viewz;
viewheight = p.viewheight; viewheight = p.viewheight;
deltaviewheight = p.deltaviewheight; deltaviewheight = p.deltaviewheight;
prevbob = p.prevbob;
bob = p.bob; bob = p.bob;
Vel = p.Vel; Vel = p.Vel;
centering = p.centering; centering = p.centering;
@ -1265,7 +1264,7 @@ void P_PlayerThink (player_t *player)
player->original_cmd = cmd->ucmd; player->original_cmd = cmd->ucmd;
// Don't interpolate the view for more than one tic // Don't interpolate the view for more than one tic
player->cheats &= ~CF_INTERPVIEW; player->cheats &= ~CF_INTERPVIEW;
player->prevbob = player->bob; player->mo->FloatVar("prevBob") = player->bob;
IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, PlayerThink) IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, PlayerThink)
{ {
@ -1736,7 +1735,6 @@ DEFINE_FIELD_X(PlayerInfo, player_t, FOV)
DEFINE_FIELD_X(PlayerInfo, player_t, viewz) DEFINE_FIELD_X(PlayerInfo, player_t, viewz)
DEFINE_FIELD_X(PlayerInfo, player_t, viewheight) DEFINE_FIELD_X(PlayerInfo, player_t, viewheight)
DEFINE_FIELD_X(PlayerInfo, player_t, deltaviewheight) 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, bob)
DEFINE_FIELD_X(PlayerInfo, player_t, Vel) DEFINE_FIELD_X(PlayerInfo, player_t, Vel)
DEFINE_FIELD_X(PlayerInfo, player_t, centering) DEFINE_FIELD_X(PlayerInfo, player_t, centering)

4
wadsrc/static/zscript/actors/player/player.zs
View file

@ -49,6 +49,7 @@ class PlayerPawn : Actor
double ViewBob; // [SP] ViewBob Multiplier double ViewBob; // [SP] ViewBob Multiplier
double FullHeight; double FullHeight;
double curBob; double curBob;
double prevBob;
meta Name HealingRadiusType; meta Name HealingRadiusType;
meta Name InvulMode; meta Name InvulMode;
@ -2358,7 +2359,7 @@ class PlayerPawn : Actor
double bobVal = player.bob; double bobVal = player.bob;
if (i == 0) if (i == 0)
{ {
bobVal = player.prevBob; bobVal = prevBob;
} }
//[SP] Added in decorate player.viewbob checks //[SP] Added in decorate player.viewbob checks
double bobx = (bobVal * BobIntensity * Rangex * ViewBob); double bobx = (bobVal * BobIntensity * Rangex * ViewBob);
@ -2646,7 +2647,6 @@ struct PlayerInfo native play // self is what internally is known as player_t
native double viewz; native double viewz;
native double viewheight; native double viewheight;
native double deltaviewheight; native double deltaviewheight;
native float prevbob;
native double bob; native double bob;
native vector2 vel; native vector2 vel;
native bool centering; native bool centering;