From b3bd2e686c06f978abbb2e59c9983daf4c598da7 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 2 May 2018 07:13:01 +0000 Subject: [PATCH] WWII GI: Fix the chaingun replacement to always reload even if you continue holding down fire. git-svn-id: https://svn.eduke32.com/eduke32@6871 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/player.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index d75f601b7..0eede9de1 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -1946,6 +1946,13 @@ static void P_FireWeapon(int playerNum) #endif // POLYMER pPlayer->visibility = 0; } + + if (/*!(PWEAPON(playerNum, p->curr_weapon, Flags) & WEAPON_CHECKATRELOAD) && */ pPlayer->reloading == 1 || + (PWEAPON(playerNum, pPlayer->curr_weapon, Reload) > PWEAPON(playerNum, pPlayer->curr_weapon, TotalTime) && pPlayer->ammo_amount[pPlayer->curr_weapon] > 0 + && (PWEAPON(playerNum, pPlayer->curr_weapon, Clip)) && (((pPlayer->ammo_amount[pPlayer->curr_weapon]%(PWEAPON(playerNum, pPlayer->curr_weapon, Clip)))==0)))) + { + pPlayer->kickback_pic = PWEAPON(playerNum, pPlayer->curr_weapon, TotalTime); + } } static void P_DoWeaponSpawn(int playerNum)