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

- handle the Harmony status bar icon scaling a bit more robustly.

Browse source 
Considering that the physical texture size should be abstracted away from modding this needs to be done differently.
Doing any calculations with physical texture sizes on the mod side is only going to cause errors so this had been changed to always return scaled size.
This commit is contained in:
Christoph Oelckers 2018-12-06 20:21:33 +01:00
parent a4d61e6fb1
commit d500dc99ea
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
wadsrc/static/zscript/statusbar/harm_sbar.txt
View file

@ -1,6 +1,6 @@
class HarmonyStatusBar : DoomStatusBar class HarmonyStatusBar : DoomStatusBar
{ {
int scalestate; double scaleFactor;
override void Init() override void Init()
{ {
@ -10,22 +10,14 @@ class HarmonyStatusBar : DoomStatusBar
let tex = TexMan.CheckForTexture("MEDIA0", TexMan.Type_Sprite); let tex = TexMan.CheckForTexture("MEDIA0", TexMan.Type_Sprite);
if (tex.isValid()) if (tex.isValid())
{ {
int size = TexMan.GetSize(tex);
Vector2 ssize = TexMan.GetScaledSize(tex); Vector2 ssize = TexMan.GetScaledSize(tex);
if (ssize.X ~== size) scalestate = 1; Vector2 facs = (ssize.X / 31, ssize.Y / 18);
else scalestate = 0; scaleFactor = min(facs.X, facs.Y, 1);
} }
else scalestate = 1;
} }
override void Draw (int state, double TicFrac) override void Draw (int state, double TicFrac)
{ {
if (!scalestate)
{
Super.Draw(state, TicFrac);
return;
}
BaseStatusBar.Draw (state, TicFrac); BaseStatusBar.Draw (state, TicFrac);
if (state == HUD_StatusBar) if (state == HUD_StatusBar)
@ -44,13 +36,13 @@ class HarmonyStatusBar : DoomStatusBar
{ {
Vector2 iconbox = (40, 20); Vector2 iconbox = (40, 20);
// Draw health // Draw health
DrawImage("MEDIA0", (20, -2), scale:(0.3, 0.3)); DrawImage("MEDIA0", (20, -2), scale(scaleFactor, scaleFactor));
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 && armor.Amount > 0) if (armor != null && armor.Amount > 0)
{ {
DrawInventoryIcon(armor, (20, -22), scale:(0.3, 0.3)); DrawInventoryIcon(armor, (20, -22), scale(scaleFactor, scaleFactor));
DrawString(mHUDFont, FormatNumber(armor.Amount, 3), (44, -40)); DrawString(mHUDFont, FormatNumber(armor.Amount, 3), (44, -40));
} }
Inventory ammotype1, ammotype2; Inventory ammotype1, ammotype2;
@ -58,13 +50,13 @@ class HarmonyStatusBar : DoomStatusBar
int invY = -20; int invY = -20;
if (ammotype1 != null) if (ammotype1 != null)
{ {
DrawInventoryIcon(ammotype1, (-14, -4), scale:(0.3, 0.3)); DrawInventoryIcon(ammotype1, (-14, -4), scale(scaleFactor, scaleFactor));
DrawString(mHUDFont, FormatNumber(ammotype1.Amount, 3), (-30, -20), DI_TEXT_ALIGN_RIGHT); DrawString(mHUDFont, FormatNumber(ammotype1.Amount, 3), (-30, -20), DI_TEXT_ALIGN_RIGHT);
invY -= 20; invY -= 20;
} }
if (ammotype2 != null && ammotype2 != ammotype1) if (ammotype2 != null && ammotype2 != ammotype1)
{ {
DrawInventoryIcon(ammotype2, (-14, invY + 17), scale:(0.3, 0.3)); DrawInventoryIcon(ammotype2, (-14, invY + 17), scale(scaleFactor, scaleFactor));
DrawString(mHUDFont, FormatNumber(ammotype2.Amount, 3), (-30, invY), DI_TEXT_ALIGN_RIGHT); DrawString(mHUDFont, FormatNumber(ammotype2.Amount, 3), (-30, invY), DI_TEXT_ALIGN_RIGHT);
invY -= 20; invY -= 20;
} }