From cb01fb0cf21bc2f73a79bcc1333b0907265b3f19 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sat, 24 Jul 2021 16:18:06 +1000 Subject: [PATCH] - Duke/RR: Remove check `p.gotweapon[]` check in `DrawWeaponBar()` that was causing weapon bar to display incorrect tiles and values. * Fixes https://forum.zdoom.org/viewtopic.php?f=340&t=72541. --- wadsrc/static/zscript/games/duke/ui/sbar_r.zs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/wadsrc/static/zscript/games/duke/ui/sbar_r.zs b/wadsrc/static/zscript/games/duke/ui/sbar_r.zs index 79c6c7aec..fc05db7f4 100644 --- a/wadsrc/static/zscript/games/duke/ui/sbar_r.zs +++ b/wadsrc/static/zscript/games/duke/ui/sbar_r.zs @@ -298,11 +298,8 @@ class RedneckStatusBar : DukeCommonStatusBar } else { - if (p.gotweapon[i+1]) - { - texname = "AMMO_ICON" .. i; - format = String.Format("%d", p.ammo_amount[i+1]); - } + texname = "AMMO_ICON" .. i; + format = String.Format("%d", p.ammo_amount[i+1]); } DrawImage(texname, (18 + i * 32, top - 6.5), DI_ITEM_OFFSETS, scale:(sbscale, sbscale));