- Duke: Move moto tilt scaling into main tilt function, not within the draw code.

This commit is contained in:
Mitchell Richters 2023-04-25 08:37:38 +10:00
parent 6004a9fb5a
commit 6d2e114dec
3 changed files with 6 additions and 3 deletions

View file

@ -199,7 +199,7 @@ void displayweapon_r(int snum, double interpfrac)
temp_kb = RTILE_MOTOHIT;
}
ShowMotorcycle(160 + offsets.X, 174, temp_kb, shade, 0, pal, -TiltStatus * 5);
ShowMotorcycle(160 + offsets.X, 174, temp_kb, shade, 0, pal, -TiltStatus);
return;
}
if (p->OnBoat)

View file

@ -32,6 +32,7 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
#include "mapinfo.h"
#include "dukeactor.h"
EXTERN_CVAR(Float, cl_viewtiltscale);
CVAR(Bool, cl_rrvehicletilting, false, CVAR_ARCHIVE);
BEGIN_DUKE_NS
@ -726,7 +727,9 @@ static unsigned outVehicleFlags(player_struct* p, ESyncBits& actions)
static void doVehicleTilting(player_struct* const p, const bool canTilt)
{
const auto pact = p->GetActor();
const auto adj = DAngle::fromDeg(p->sync.avel * 0.375 * canTilt);
auto adj = DAngle::fromDeg(p->sync.avel * 0.279625 * canTilt);
if (p->OnMotorcycle) adj *= 5;
if (cl_rrvehicletilting) adj *= cl_viewtiltscale;
p->oTiltStatus = p->TiltStatus;
p->TiltStatus += adj;

View file

@ -1139,11 +1139,11 @@ OptionMenu "VideoOptions" protected
Option "$DSPLYMNU_VIEWSWAY", "cl_viewhbob", "OnOff"
}
Option "$DSPLYMNU_VIEWTILTING", "cl_viewtilting", "ViewTilting"
Slider "$DSPLYMNU_VIEWTILTSCALE", "cl_viewtiltscale", 0.0, 2.0, 0.05
ifgame (RedneckRides)
{
Option "$DSPLYMNU_VEHTILTING", "cl_rrvehicletilting", "OnOff"
}
Slider "$DSPLYMNU_VIEWTILTSCALE", "cl_viewtiltscale", 0.0, 2.0, 0.05
Slider "$DSPLYMNU_FOV", "r_fov", 60, 130, 10, 1
StaticText ""