From ebc16ffe14f1292d4c7b4d1f28f97b1f817ca484 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 17 Aug 2020 20:43:31 +0200 Subject: [PATCH] - do not display ammo for fists and sword Fixes #192 --- source/sw/src/sbar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/sw/src/sbar.cpp b/source/sw/src/sbar.cpp index 424effc14..394dc4299 100644 --- a/source/sw/src/sbar.cpp +++ b/source/sw/src/sbar.cpp @@ -667,7 +667,8 @@ private: DrawGraphic(tileGetTexture(STATUS_BAR), 0, 200, DI_ITEM_LEFT_BOTTOM, 1, -1, -1, 1, 1); DisplayPanelNumber(PANEL_HEALTH_BOX_X + PANEL_HEALTH_XOFF, PANEL_BOX_Y + PANEL_HEALTH_YOFF, u->Health); DisplayPanelNumber(PANEL_ARMOR_BOX_X + PANEL_ARMOR_XOFF, PANEL_BOX_Y + PANEL_ARMOR_YOFF, pp->Armor); - DisplayPanelNumber(PANEL_AMMO_BOX_X + PANEL_AMMO_XOFF, PANEL_BOX_Y + PANEL_AMMO_YOFF, pp->WpnAmmo[u->WeaponNum]); + if (u->WeaponNum != WPN_FIST && u->WeaponNum != WPN_SWORD) + DisplayPanelNumber(PANEL_AMMO_BOX_X + PANEL_AMMO_XOFF, PANEL_BOX_Y + PANEL_AMMO_YOFF, pp->WpnAmmo[u->WeaponNum]); PlayerUpdateWeaponSummaryAll(pp); if (gNet.MultiGameType != MULTI_GAME_COMMBAT) DisplayKeys(pp, PANEL_KEYS_BOX_X, PANEL_BOX_Y);