From a31ad532ddd0ec4ce37b68cd423c6e21ec4983ce Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Mon, 26 Dec 2016 06:01:57 +0000 Subject: [PATCH] Fix an error introduced in cleanup of the WWII GI Devastator weapon reload animation, as pointed out by Xcode. Also perform similar cleanup on a similar line elsewhere. git-svn-id: https://svn.eduke32.com/eduke32@5959 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 44d1eda4f..dbe361083 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -2626,9 +2626,9 @@ void P_DisplayWeapon(void) // else we are in 'reload time' else { - weaponYOffset -= 10 * (*weaponFrame < ((reloadTime - totalTime) / 2 + totalTime)) - ? ((*weaponFrame) - totalTime) - : (reloadTime - (*weaponFrame)); + weaponYOffset -= (*weaponFrame < ((reloadTime - totalTime) / 2 + totalTime)) + ? 10 * ((*weaponFrame) - totalTime) + : 10 * (reloadTime - (*weaponFrame)); G_DrawWeaponTileWithID(currentWeapon, weaponX + 268 - halfLookAng, weaponY + 238 - weaponYOffset, DEVISTATOR, weaponShade, weaponBits, weaponPal, 0); @@ -2755,10 +2755,9 @@ void P_DisplayWeapon(void) } } // else we are in 'reload time' - else if (*weaponFrame < ((reloadTime - totalTime) / 2 + totalTime)) - weaponYOffset -= (currentWeapon == GROW_WEAPON ? 5 : 10) * ((*weaponFrame) - totalTime); // D - else - weaponYOffset -= 10 * (reloadTime - (*weaponFrame)); // U + weaponYOffset -= (*weaponFrame < ((reloadTime - totalTime) / 2 + totalTime)) + ? (currentWeapon == GROW_WEAPON ? 5 : 10) * ((*weaponFrame) - totalTime) // D + : 10 * (reloadTime - (*weaponFrame)); // U } G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 184 - halfLookAng, weaponY + 240 - weaponYOffset,