zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 16:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: do not draw armor on the fullscreen HUD if the amount is 0.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-13 20:43:17 +02:00
parent 29394da7ed
commit b1057cee36
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dthinker.cpp
View file

@ -714,10 +714,6 @@ class DThinkerIterator : public DObject, public FThinkerIterator
{ {
DECLARE_ABSTRACT_CLASS(DThinkerIterator, DObject) DECLARE_ABSTRACT_CLASS(DThinkerIterator, DObject)
DThinkerIterator()
{
}
public: public:
DThinkerIterator(PClass *cls, int statnum = MAX_STATNUM + 1) DThinkerIterator(PClass *cls, int statnum = MAX_STATNUM + 1)
: FThinkerIterator(cls, statnum) : FThinkerIterator(cls, statnum)

2
wadsrc/static/zscript/statusbar/doom_sbar.txt
View file

@ -139,7 +139,7 @@ class DoomStatusBar : BaseStatusBar
DrawString(mHUDFont, FormatNumber(CPlayer.health, 3), (44, -20)); DrawString(mHUDFont, FormatNumber(CPlayer.health, 3), (44, -20));
let armor = CPlayer.mo.FindInventory("BasicArmor"); let armor = CPlayer.mo.FindInventory("BasicArmor");
if (armor != null) if (armor != null && armor.Amount > 0)
{ {
DrawInventoryIcon(armor, (20, -22)); DrawInventoryIcon(armor, (20, -22));
DrawString(mHUDFont, FormatNumber(armor.Amount, 3), (44, -40)); DrawString(mHUDFont, FormatNumber(armor.Amount, 3), (44, -40));

2
wadsrc/static/zscript/statusbar/heretic_sbar.txt
View file

@ -143,7 +143,7 @@ class HereticStatusBar : BaseStatusBar
//armor //armor
let armor = CPlayer.mo.FindInventory("BasicArmor"); let armor = CPlayer.mo.FindInventory("BasicArmor");
if (armor != null) if (armor != null && armor.Amount > 0)
{ {
DrawInventoryIcon(armor, (58, -24)); DrawInventoryIcon(armor, (58, -24));
DrawString(mBigFont, FormatNumber(armor.Amount, 3), (41, -43), DI_TEXT_ALIGN_RIGHT); DrawString(mBigFont, FormatNumber(armor.Amount, 3), (41, -43), DI_TEXT_ALIGN_RIGHT);