From b1057cee36025906df27195540f3dd881fa618f3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 13 Apr 2017 20:43:17 +0200 Subject: [PATCH] - fixed: do not draw armor on the fullscreen HUD if the amount is 0. --- src/dthinker.cpp | 4 ---- wadsrc/static/zscript/statusbar/doom_sbar.txt | 2 +- wadsrc/static/zscript/statusbar/heretic_sbar.txt | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/dthinker.cpp b/src/dthinker.cpp index 5144cf56e..35dd6505c 100644 --- a/src/dthinker.cpp +++ b/src/dthinker.cpp @@ -714,10 +714,6 @@ class DThinkerIterator : public DObject, public FThinkerIterator { DECLARE_ABSTRACT_CLASS(DThinkerIterator, DObject) - DThinkerIterator() - { - } - public: DThinkerIterator(PClass *cls, int statnum = MAX_STATNUM + 1) : FThinkerIterator(cls, statnum) diff --git a/wadsrc/static/zscript/statusbar/doom_sbar.txt b/wadsrc/static/zscript/statusbar/doom_sbar.txt index 12935fa89..00471540b 100644 --- a/wadsrc/static/zscript/statusbar/doom_sbar.txt +++ b/wadsrc/static/zscript/statusbar/doom_sbar.txt @@ -139,7 +139,7 @@ class DoomStatusBar : BaseStatusBar DrawString(mHUDFont, FormatNumber(CPlayer.health, 3), (44, -20)); let armor = CPlayer.mo.FindInventory("BasicArmor"); - if (armor != null) + if (armor != null && armor.Amount > 0) { DrawInventoryIcon(armor, (20, -22)); DrawString(mHUDFont, FormatNumber(armor.Amount, 3), (44, -40)); diff --git a/wadsrc/static/zscript/statusbar/heretic_sbar.txt b/wadsrc/static/zscript/statusbar/heretic_sbar.txt index b6db47dcf..691a89e33 100644 --- a/wadsrc/static/zscript/statusbar/heretic_sbar.txt +++ b/wadsrc/static/zscript/statusbar/heretic_sbar.txt @@ -143,7 +143,7 @@ class HereticStatusBar : BaseStatusBar //armor let armor = CPlayer.mo.FindInventory("BasicArmor"); - if (armor != null) + if (armor != null && armor.Amount > 0) { DrawInventoryIcon(armor, (58, -24)); DrawString(mBigFont, FormatNumber(armor.Amount, 3), (41, -43), DI_TEXT_ALIGN_RIGHT);