zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Remove local calculation of turboturntime for RRRA vehicles in lieu of backend solution.

Browse source
This commit is contained in:
Mitchell Richters 2021-01-02 09:59:51 +11:00
parent 36c25ee2a0
commit e65e112281
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
source/games/duke/src/input.cpp
View file

@ -42,8 +42,6 @@ source as it is released.
BEGIN_DUKE_NS BEGIN_DUKE_NS
// State timer counters. // State timer counters.
static int turnheldtime;
static int lastcontroltime;
static InputPacket loc; // input accumulation buffer. static InputPacket loc; // input accumulation buffer.
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -546,19 +544,6 @@ static void processInputBits(player_struct *p, ControlInfo* const hidInput)
} }
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int getticssincelastupdate()
{
int tics = lastcontroltime == 0 || ud.levelclock < lastcontroltime ? 0 : ud.levelclock - lastcontroltime;
lastcontroltime = ud.levelclock;
return tics;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// split out for readability // split out for readability
@ -572,8 +557,7 @@ static double motoApplyTurn(player_struct* p, ControlInfo* const hidInput, bool
if (p->MotoSpeed == 0 || !p->on_ground) if (p->MotoSpeed == 0 || !p->on_ground)
{ {
turnheldtime = 0; resetTurnHeldAmt();
lastcontroltime = 0;
if (kbdLeft || hidInput->mouseturnx < 0 || hidInput->dyaw < 0) if (kbdLeft || hidInput->mouseturnx < 0 || hidInput->dyaw < 0)
{ {
@ -594,18 +578,17 @@ static double motoApplyTurn(player_struct* p, ControlInfo* const hidInput, bool
{ {
double const velScale = 3. / 10; double const velScale = 3. / 10;
auto const baseVel = (buttonMap.ButtonDown(gamefunc_Move_Backward) || hidInput->dz < 0) && p->MotoSpeed <= 0 ? -VEHICLETURN : VEHICLETURN; auto const baseVel = (buttonMap.ButtonDown(gamefunc_Move_Backward) || hidInput->dz < 0) && p->MotoSpeed <= 0 ? -VEHICLETURN : VEHICLETURN;
int tics = getticssincelastupdate();
if (kbdLeft || p->moto_drink < 0 || hidInput->mouseturnx < 0 || hidInput->dyaw < 0) if (kbdLeft || p->moto_drink < 0 || hidInput->mouseturnx < 0 || hidInput->dyaw < 0)
{ {
turnheldtime += tics; updateTurnHeldAmt(factor);
p->TiltStatus -= factor; p->TiltStatus -= factor;
if (p->TiltStatus < -10) if (p->TiltStatus < -10)
p->TiltStatus = -10; p->TiltStatus = -10;
if (kbdLeft) if (kbdLeft)
turnvel -= turnheldtime >= TURBOTURNTIME && p->MotoSpeed > 0 ? baseVel : baseVel * velScale; turnvel -= isTurboTurnTime() && p->MotoSpeed > 0 ? baseVel : baseVel * velScale;
if (hidInput->mouseturnx < 0) if (hidInput->mouseturnx < 0)
turnvel -= sqrt((p->MotoSpeed > 0 ? baseVel : baseVel * velScale) * -(hidInput->mouseturnx / factor) * 2.); turnvel -= sqrt((p->MotoSpeed > 0 ? baseVel : baseVel * velScale) * -(hidInput->mouseturnx / factor) * 2.);
@ -616,14 +599,14 @@ static double motoApplyTurn(player_struct* p, ControlInfo* const hidInput, bool
if (kbdRight || p->moto_drink > 0 || hidInput->mouseturnx > 0 || hidInput->dyaw > 0) if (kbdRight || p->moto_drink > 0 || hidInput->mouseturnx > 0 || hidInput->dyaw > 0)
{ {
turnheldtime += tics; updateTurnHeldAmt(factor);
p->TiltStatus += factor; p->TiltStatus += factor;
if (p->TiltStatus > 10) if (p->TiltStatus > 10)
p->TiltStatus = 10; p->TiltStatus = 10;
if (kbdRight) if (kbdRight)
turnvel += turnheldtime >= TURBOTURNTIME && p->MotoSpeed > 0 ? baseVel : baseVel * velScale; turnvel += isTurboTurnTime() && p->MotoSpeed > 0 ? baseVel : baseVel * velScale;
if (hidInput->mouseturnx > 0) if (hidInput->mouseturnx > 0)
turnvel += sqrt((p->MotoSpeed > 0 ? baseVel : baseVel * velScale) * (hidInput->mouseturnx / factor) * 2.); turnvel += sqrt((p->MotoSpeed > 0 ? baseVel : baseVel * velScale) * (hidInput->mouseturnx / factor) * 2.);
@ -634,8 +617,7 @@ static double motoApplyTurn(player_struct* p, ControlInfo* const hidInput, bool
} }
else else
{ {
turnheldtime = 0; resetTurnHeldAmt();
lastcontroltime = 0;
if (p->TiltStatus > 0) if (p->TiltStatus > 0)
p->TiltStatus -= factor; p->TiltStatus -= factor;
@ -667,11 +649,10 @@ static double boatApplyTurn(player_struct *p, ControlInfo* const hidInput, bool
{ {
double const velScale = 6. / 19.; double const velScale = 6. / 19.;
auto const baseVel = !p->NotOnWater ? VEHICLETURN : VEHICLETURN * velScale; auto const baseVel = !p->NotOnWater ? VEHICLETURN : VEHICLETURN * velScale;
int tics = getticssincelastupdate();
if (kbdLeft || p->moto_drink < 0 || hidInput->mouseturnx < 0 || hidInput->dyaw < 0) if (kbdLeft || p->moto_drink < 0 || hidInput->mouseturnx < 0 || hidInput->dyaw < 0)
{ {
turnheldtime += tics; updateTurnHeldAmt(factor);
if (!p->NotOnWater) if (!p->NotOnWater)
{ {
@ -681,7 +662,7 @@ static double boatApplyTurn(player_struct *p, ControlInfo* const hidInput, bool
} }
if (kbdLeft) if (kbdLeft)
turnvel -= turnheldtime >= TURBOTURNTIME ? baseVel : baseVel * velScale; turnvel -= isTurboTurnTime() ? baseVel : baseVel * velScale;
if (hidInput->mouseturnx < 0) if (hidInput->mouseturnx < 0)
turnvel -= sqrt(baseVel * -(hidInput->mouseturnx / factor) * 2.); turnvel -= sqrt(baseVel * -(hidInput->mouseturnx / factor) * 2.);
@ -692,7 +673,7 @@ static double boatApplyTurn(player_struct *p, ControlInfo* const hidInput, bool
if (kbdRight || p->moto_drink > 0 || hidInput->mouseturnx > 0 || hidInput->dyaw > 0) if (kbdRight || p->moto_drink > 0 || hidInput->mouseturnx > 0 || hidInput->dyaw > 0)
{ {
turnheldtime += tics; updateTurnHeldAmt(factor);
if (!p->NotOnWater) if (!p->NotOnWater)
{ {
@ -702,7 +683,7 @@ static double boatApplyTurn(player_struct *p, ControlInfo* const hidInput, bool
} }
if (kbdRight) if (kbdRight)
turnvel += turnheldtime >= TURBOTURNTIME ? baseVel : baseVel * velScale; turnvel += isTurboTurnTime() ? baseVel : baseVel * velScale;
if (hidInput->mouseturnx > 0) if (hidInput->mouseturnx > 0)
turnvel += sqrt(baseVel * (hidInput->mouseturnx / factor) * 2.); turnvel += sqrt(baseVel * (hidInput->mouseturnx / factor) * 2.);
@ -713,8 +694,7 @@ static double boatApplyTurn(player_struct *p, ControlInfo* const hidInput, bool
} }
else if (!p->NotOnWater) else if (!p->NotOnWater)
{ {
turnheldtime = 0; resetTurnHeldAmt();
lastcontroltime = 0;
if (p->TiltStatus > 0) if (p->TiltStatus > 0)
p->TiltStatus -= factor; p->TiltStatus -= factor;
@ -724,8 +704,7 @@ static double boatApplyTurn(player_struct *p, ControlInfo* const hidInput, bool
} }
else if (!p->NotOnWater) else if (!p->NotOnWater)
{ {
turnheldtime = 0; resetTurnHeldAmt();
lastcontroltime = 0;
if (p->TiltStatus > 0) if (p->TiltStatus > 0)
p->TiltStatus -= factor; p->TiltStatus -= factor;
@ -909,8 +888,6 @@ void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput)
void GameInterface::clearlocalinputstate() void GameInterface::clearlocalinputstate()
{ {
loc = {}; loc = {};
turnheldtime = 0;
lastcontroltime = 0;
} }