From 9bebd7fabff9f295ba9b3ec4ccfb77971435f70a Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Mon, 26 Apr 2021 12:35:07 +1000 Subject: [PATCH] - Remove max ammo fudging for when showing the magazine amount for Duke since it overrides ammo maximums set from CON. --- source/games/duke/src/player_d.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index b3dac8381..6f3873836 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -2630,27 +2630,6 @@ static void processweapon(int snum, ESyncBits actions, int psect) auto s = pact->s; int shrunk = (s->yrepeat < 32); - // Set maximum for pistol slightly higher if playing with `cl_showmagamount 1`. - if (!cl_showmagamt) - { - if (p->ammo_amount[PISTOL_WEAPON] > PISTOL_MAXDEFAULT) - p->ammo_amount[PISTOL_WEAPON] = PISTOL_MAXDEFAULT; - - if (gs.max_ammo_amount[PISTOL_WEAPON] != PISTOL_MAXDEFAULT) - gs.max_ammo_amount[PISTOL_WEAPON] = PISTOL_MAXDEFAULT; - } - else - { - short pistolAddition = 4; - short pistolNewMaximum = PISTOL_MAXDEFAULT + pistolAddition; - - if (p->ammo_amount[PISTOL_WEAPON] == PISTOL_MAXDEFAULT && gs.max_ammo_amount[PISTOL_WEAPON] == PISTOL_MAXDEFAULT) - p->ammo_amount[PISTOL_WEAPON] += pistolAddition; - - if (gs.max_ammo_amount[PISTOL_WEAPON] != pistolNewMaximum) - gs.max_ammo_amount[PISTOL_WEAPON] = pistolNewMaximum; - } - if (isNamWW2GI() && (actions & SB_HOLSTER)) // 'Holster Weapon { if (isWW2GI())