teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 15:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Reorder variables in getscaledangle().

Browse source
This commit is contained in:
Mitchell Richters 2022-11-25 21:11:32 +11:00 committed by Christoph Oelckers
parent f9aeee5b4a
commit fdcf8bbe2f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/gameinput.cpp
View file

@ -75,7 +75,7 @@ inline static double getCorrectedScale(const double scaleAdjust)
return scaleAdjust < 1. ? scaleAdjust * (1. + 0.21 * (1. - scaleAdjust)) : scaleAdjust;
}
inline static DAngle getscaledangle(const DAngle value, const double scaleAdjust, const DAngle object, const DAngle push)
inline static DAngle getscaledangle(const DAngle value, const DAngle object, const DAngle push, const double scaleAdjust = 1)
{
return ((object.Normalized180() * getTicrateScale(value)) + push) * getCorrectedScale(scaleAdjust);
}
@ -84,7 +84,7 @@ inline static void scaletozero(DAngle& object, const DAngle value, const double
{
if (auto sgn = object.Sgn())
{
object -= getscaledangle(value, scaleAdjust, object, push * sgn);
object -= getscaledangle(value, object, push * sgn, scaleAdjust);
if (sgn != object.Sgn()) object = nullAngle;
}
}
@ -300,7 +300,7 @@ void PlayerAngles::doViewPitch(const DVector2& pos, DAngle const ang, bool const
if (climbing)
{
// tilt when climbing but you can't even really tell it.
if (ViewAngles.Pitch > PITCH_HORIZOFFCLIMB) ViewAngles.Pitch += getscaledangle(PITCH_HORIZOFFSPEED, scaleAdjust, deltaangle(ViewAngles.Pitch, PITCH_HORIZOFFCLIMB), PITCH_HORIZOFFPUSH);
if (ViewAngles.Pitch > PITCH_HORIZOFFCLIMB) ViewAngles.Pitch += getscaledangle(PITCH_HORIZOFFSPEED, deltaangle(ViewAngles.Pitch, PITCH_HORIZOFFCLIMB), PITCH_HORIZOFFPUSH, scaleAdjust);
}
else
{