teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-21 17:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Move WW2GI handbomb aplWeapon*() calls to the stored ones.

Browse source
This commit is contained in:
Mitchell Richters 2022-10-14 12:16:55 +11:00 committed by Christoph Oelckers
parent c48e95a710
commit 7a3e4de913
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/duke/src/hudweapon_d.cpp
View file

@ -658,23 +658,23 @@ void displayweapon_d(int snum, double interpfrac)
if (isWW2GI())
{
if (*kb <= aplWeaponFireDelay(HANDBOMB_WEAPON, snum))
if (*kb <= weapFireDelay)
{
// it holds here
offsets.Y += 5 * kickback_pic; //D
}
else if (*kb < ((aplWeaponTotalTime(HANDBOMB_WEAPON, snum) - aplWeaponFireDelay(HANDBOMB_WEAPON, snum)) / 2 + aplWeaponFireDelay(HANDBOMB_WEAPON, snum)))
else if (*kb < ((weapTotalTime - weapFireDelay) / 2 + weapFireDelay))
{
// up and left
offsets.Y -= 10 * (kickback_pic - aplWeaponFireDelay(HANDBOMB_WEAPON, snum)); //U
offsets.X += 80 * (kickback_pic - aplWeaponFireDelay(HANDBOMB_WEAPON, snum));
offsets.Y -= 10 * (kickback_pic - weapFireDelay); //U
offsets.X += 80 * (kickback_pic - weapFireDelay);
}
else if (*kb < aplWeaponTotalTime(HANDBOMB_WEAPON, snum))
else if (*kb < weapTotalTime)
{
// move left
offsets.Y -= 240; // start high
offsets.Y += 12 * (kickback_pic - aplWeaponFireDelay(HANDBOMB_WEAPON, snum)); //D
weapon_xoffset += 90 - (5 * (aplWeaponTotalTime(HANDBOMB_WEAPON, snum) - kickback_pic));
offsets.Y += 12 * (kickback_pic - weapFireDelay); //D
weapon_xoffset += 90 - (5 * (weapTotalTime - kickback_pic));
}
}
else