zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-16 01:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed redundant map name display on alternative HUD's automap HUD.

Browse source 
# Conflicts:
#	wadsrc/static/zscript/ui/statusbar/alt_hud.zs
This commit is contained in:
Christoph Oelckers 2019-04-10 20:56:24 +02:00 committed by drfrag
parent 1a4f62c54f
commit 10c5b0588b
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
wadsrc/static/zscript/ui/statusbar/alt_hud.zs
View file

@ -726,11 +726,11 @@ class AltHud ui
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight); DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight);
} }
void DrawCoordinates(PlayerInfo CPlayer) void DrawCoordinates(PlayerInfo CPlayer, bool withmapname)
{ {
Vector3 pos; Vector3 pos;
String coordstr; String coordstr;
int h = SmallFont.GetHeight() + 1; int h = SmallFont.GetHeight();
let mo = CPlayer.mo; let mo = CPlayer.mo;
if (!map_point_coordinates || !automapactive) if (!map_point_coordinates || !automapactive)
@ -746,16 +746,19 @@ class AltHud ui
int xpos = hudwidth - SmallFont.StringWidth("X: -00000")-6; int xpos = hudwidth - SmallFont.StringWidth("X: -00000")-6;
int ypos = 18; int ypos = 18;
screen.DrawText(SmallFont, hudcolor_titl, hudwidth - 6 - SmallFont.StringWidth(level.MapName), ypos, level.MapName, if (withmapname)
DTA_KeepRatio, true, {
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight); screen.DrawText(SmallFont, hudcolor_titl, hudwidth - 6 - SmallFont.StringWidth(level.MapName), ypos, level.MapName,
DTA_KeepRatio, true,
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight);
screen.DrawText(SmallFont, hudcolor_titl, hudwidth - 6 - SmallFont.StringWidth(level.LevelName), ypos + h, level.LevelName, screen.DrawText(SmallFont, hudcolor_titl, hudwidth - 6 - SmallFont.StringWidth(level.LevelName), ypos + h, level.LevelName,
DTA_KeepRatio, true, DTA_KeepRatio, true,
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight); DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight);
ypos += 3 * h;
}
ypos += 3 * h;
DrawCoordinateEntry(xpos, ypos, String.Format("X: %.0f", pos.X)); DrawCoordinateEntry(xpos, ypos, String.Format("X: %.0f", pos.X));
ypos += h; ypos += h;
DrawCoordinateEntry(xpos, ypos, String.Format("Y: %.0f", pos.Y)); DrawCoordinateEntry(xpos, ypos, String.Format("Y: %.0f", pos.Y));
@ -924,7 +927,7 @@ class AltHud ui
y = DrawAmmo(CPlayer, hudwidth-5, y); y = DrawAmmo(CPlayer, hudwidth-5, y);
if (hud_showweapons) DrawWeapons(CPlayer, hudwidth - 5, y); if (hud_showweapons) DrawWeapons(CPlayer, hudwidth - 5, y);
DrawInventory(CPlayer, 144, hudheight - 28); DrawInventory(CPlayer, 144, hudheight - 28);
if (idmypos) DrawCoordinates(CPlayer); if (idmypos) DrawCoordinates(CPlayer, true);
int h = SmallFont.GetHeight(); int h = SmallFont.GetHeight();
y = h; y = h;
@ -966,7 +969,7 @@ class AltHud ui
DTA_KeepRatio, true, DTA_KeepRatio, true,
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight); DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight);
DrawCoordinates(CPlayer); DrawCoordinates(CPlayer, false);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------