From 7a3e4de913e34da69c81d396f852fc5a031b4d08 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Fri, 14 Oct 2022 12:16:55 +1100 Subject: [PATCH] - Duke: Move WW2GI handbomb aplWeapon*() calls to the stored ones. --- source/games/duke/src/hudweapon_d.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp index 9d2ad7d38..ec68b9d15 100644 --- a/source/games/duke/src/hudweapon_d.cpp +++ b/source/games/duke/src/hudweapon_d.cpp @@ -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