zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- uplift `boatApplyTurn()` with changes from e0bc2c6c97. 

* Handle button-mashing to provide a better experience.
* Rename `bike_turn` to `boat_turn`.
* Move application of scale to returning value within `boatApplyTurn()`.
* Use doubled return values like Rednukem (20 -> 40, 10 -> 20, 6 -> 12, 3 -> 6, 2 -> 4, 1 -> 2).
* Return `p->TiltStatus` towards 0 if `p->MotoSpeed` == 0 and `p->NotOnWater`.
* Always test if `p->TiltStatus` < `0.025`.
This commit is contained in:
Mitchell Richters 2020-07-24 21:27:47 +10:00
parent e0bc2c6c97
commit 4bf5c3d6b5
1 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
source/games/duke/src/input.cpp
View File

@ -1017,50 +1017,55 @@ static double motoApplyTurn(player_struct* p, int turnl, int turnr, int bike_tur
//
//---------------------------------------------------------------------------
static int boatApplyTurn(player_struct *p, int turnl, int turnr, int bike_turn, double factor)
static double boatApplyTurn(player_struct *p, int turnl, int turnr, int boat_turn, double factor)
{
int turnvel = 0;
int tics = getticssincelastupdate();
if (p->MotoSpeed)
{
if (turnl || p->moto_drink < 0)
if (turnl || turnr || p->moto_drink != 0)
{
turnheldtime += tics;
if (!p->NotOnWater)
if (turnl || p->moto_drink < 0)
{
p->TiltStatus -= (float)factor;
if (p->TiltStatus < -10)
p->TiltStatus = -10;
turnheldtime += tics;
if (!p->NotOnWater)
{
p->TiltStatus -= (float)factor;
if (p->TiltStatus < -10)
p->TiltStatus = -10;
}
if (turnheldtime >= TURBOTURNTIME)
{
if (p->NotOnWater) turnvel += boat_turn ? -12 : -6;
else turnvel += boat_turn ? -40 : -20;
}
else
{
if (p->NotOnWater) turnvel += boat_turn ? -4 : -2;
else turnvel += boat_turn ? -12 : -6;
}
}
if (turnheldtime >= TURBOTURNTIME && p->MotoSpeed != 0)
if (turnr || p->moto_drink > 0)
{
if (p->NotOnWater) return bike_turn ? -6 : -3;
else return bike_turn ? -20 : -10;
}
else if (turnheldtime < TURBOTURNTIME && p->MotoSpeed != 0)
{
if (p->NotOnWater) return bike_turn ? -2 : -1;
else return bike_turn ? -6 : -3;
}
}
else if (turnr || p->moto_drink > 0)
{
turnheldtime += tics;
if (!p->NotOnWater)
{
p->TiltStatus += (float)factor;
if (p->TiltStatus > 10)
p->TiltStatus = 10;
}
if (turnheldtime >= TURBOTURNTIME && p->MotoSpeed != 0)
{
if (p->NotOnWater) return bike_turn ? 6 : 3;
else return bike_turn ? 20 : 10;
}
else if (turnheldtime < TURBOTURNTIME && p->MotoSpeed != 0)
{
if (p->NotOnWater) return bike_turn ? 2 : 1;
else return bike_turn ? 6 : 3;
turnheldtime += tics;
if (!p->NotOnWater)
{
p->TiltStatus += (float)factor;
if (p->TiltStatus > 10)
p->TiltStatus = 10;
}
if (turnheldtime >= TURBOTURNTIME)
{
if (p->NotOnWater) turnvel += boat_turn ? 12 : 6;
else turnvel += boat_turn ? 40 : 20;
}
else
{
if (p->NotOnWater) turnvel += boat_turn ? 4 : 2;
else turnvel += boat_turn ? 12 : 6;
}
}
}
else if (!p->NotOnWater)
@ -1072,17 +1077,23 @@ static int boatApplyTurn(player_struct *p, int turnl, int turnr, int bike_turn,
p->TiltStatus -= (float)factor;
else if (p->TiltStatus < 0)
p->TiltStatus += (float)factor;
if (fabs(p->TiltStatus) < 0.025)
p->TiltStatus = 0;
}
}
else
else if (!p->NotOnWater)
{
turnheldtime = 0;
lastcontroltime = 0;
if (p->TiltStatus > 0)
p->TiltStatus -= (float)factor;
else if (p->TiltStatus < 0)
p->TiltStatus += (float)factor;
}
return 0;
if (fabs(p->TiltStatus) < 0.025)
p->TiltStatus = 0;
return turnvel * factor;
}
//---------------------------------------------------------------------------
@ -1132,7 +1143,7 @@ static void processVehicleInput(player_struct *p, ControlInfo& info, input_t& in
}
else
{
turnvel = boatApplyTurn(p, turnl, turnr, turnspeed != 0, scaleAdjust) * scaleAdjust * 2;
turnvel = boatApplyTurn(p, turnl, turnr, turnspeed != 0, scaleAdjust);
}
// What is this? Optimization for playing with a mouse which the original did not have?