zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-23 17:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Incorporate player weapon bobbing into pilot light angle.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-17 14:24:03 +10:00
parent a28ca29493
commit 4c49b91635
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/exhumed/src/gun.cpp
View file

@ -933,6 +933,9 @@ void DrawWeapons(Player* const pPlayer, double interpfrac)
double xPos = 160 + weaponOffsets.first.X;
double yPos = 100 + weaponOffsets.first.Y;
double nFlameAng = interpolatedvalue(lastavel, pPlayer->input.avel, interpfrac);
lastavel = pPlayer->input.avel;
if (cl_weaponsway)
{
double nBobAngle = bobangle, nTotalVel = pPlayer->totalvel;
@ -943,8 +946,12 @@ void DrawWeapons(Player* const pPlayer, double interpfrac)
nTotalVel = interpolatedvalue<double>(pPlayer->ototalvel, pPlayer->totalvel, interpfrac);
}
xPos += nTotalVel * BobVal(nBobAngle + 512) * (1. / 8.) * (nState == 1);
yPos += nTotalVel * fabs(BobVal(nBobAngle)) * (1. / 16.);
const auto xBob = nTotalVel * BobVal(nBobAngle + 512) * (1. / 16.) * (nState == 1);
const auto yBob = nTotalVel * fabs(BobVal(nBobAngle)) * (1. / 16.);
nFlameAng += xBob;
xPos += xBob * 2.;
yPos += yBob;
}
else
{
@ -957,8 +964,7 @@ void DrawWeapons(Player* const pPlayer, double interpfrac)
{
if (!(pPlayer->pPlayerViewSect->Flag & kSectUnderwater))
{
seq_DrawPilotLightSeq(xPos, yPos, interpolatedvalue(lastavel, pPlayer->input.avel, interpfrac) * 2.);
lastavel = pPlayer->input.avel;
seq_DrawPilotLightSeq(xPos, yPos, nFlameAng);
}
}
else if (nWeapon == 8 || nWeapon == 9)