From 26ffc82cc0afd4bfcb28358d56b04a0beedace6d Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Fri, 28 Aug 2020 12:34:34 +1000 Subject: [PATCH] - SW: Remove duplicated code from dd832aaea3f688b375c74643606f299c76d92f3b. --- source/sw/src/sbar.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/sw/src/sbar.cpp b/source/sw/src/sbar.cpp index 71d2baa12..5addc629d 100644 --- a/source/sw/src/sbar.cpp +++ b/source/sw/src/sbar.cpp @@ -825,19 +825,17 @@ private: } else { - short clip; short capacity; switch (weapon) { case WPN_SHOTGUN: capacity = 4; - clip = CalcMagazineAmount(ammo, capacity, DoReloadStatus(&pp->WpnReloadState, ammo % capacity)); break; case WPN_UZI: capacity = pp->WpnUziType ? 50 : 100; - clip = CalcMagazineAmount(ammo, capacity, DoReloadStatus(&pp->WpnReloadState, ammo % capacity)); break; } + short clip = CalcMagazineAmount(ammo, capacity, DoReloadStatus(&pp->WpnReloadState, ammo % capacity)); format.Format("%d/%d", clip, ammo - clip); } img = tileGetTexture(wicon);