zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use generalized automap label code for Shadow Warrior, too.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-25 00:16:02 +02:00
parent faf23d8ff0
commit 7c1e64757a
2 changed files with 20 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/sw/src/draw.cpp
View file

@ -1831,9 +1831,6 @@ drawscreen(PLAYERp pp)
newaspect_enable = 0; newaspect_enable = 0;
renderSetAspect(viewingRange, divscale16(ydim * 8, xdim * 5)); renderSetAspect(viewingRange, divscale16(ydim * 8, xdim * 5));
} }
UpdateStatusBar(totalclock);
UpdatePanel(smoothratio); UpdatePanel(smoothratio);
#define SLIME 2305 #define SLIME 2305
@ -1924,10 +1921,8 @@ drawscreen(PLAYERp pp)
SyncStatMessage(); SyncStatMessage();
#endif #endif
UpdateStatusBar(totalclock);
DrawCrosshair(pp); DrawCrosshair(pp);
DoPlayerDiveMeter(pp); // Do the underwater breathing bar DoPlayerDiveMeter(pp); // Do the underwater breathing bar
// Boss Health Meter, if Boss present // Boss Health Meter, if Boss present

46
source/sw/src/sbar.cpp
View file

@ -895,47 +895,35 @@ private:
void PrintLevelStats(int bottomy) void PrintLevelStats(int bottomy)
{ {
FLevelStats stats{};
stats.fontscale = 1;
stats.spacing = 7;
stats.screenbottomspace = bottomy;
stats.font = SmallFont;
stats.time = Scale(PlayClock, 1000, 120);
if (automapMode == am_full) if (automapMode == am_full)
{ {
int txt_x, txt_y; stats.letterColor = CR_SAPPHIRE;
// draw location text (moved here so that it gets printed on top of the border) stats.standardColor = CR_UNTRANSLATED;
if (hud_size == Hud_Nothing) if (!am_textfont)
{ {
txt_x = 7; stats.font = SmallFont2;
txt_y = 168; stats.spacing = 6;
} }
else else stats.spacing = SmallFont->GetHeight() + 1;
{ DBaseStatusBar::PrintAutomapInfo(stats);
txt_x = 7;
txt_y = 147;
}
if (automapFollow)
{
MNU_DrawSmallString(txt_x, txt_y - 7, "Follow Mode", 0, 0);
}
sprintf(ds,"%s",currentLevel->DisplayName());
MNU_DrawSmallString(txt_x,txt_y,ds,0, 0);
} }
// JBF 20040124: display level stats in screen corner // JBF 20040124: display level stats in screen corner
else if (hud_stats && !(CommEnabled || numplayers > 1)) else if (hud_stats && !(CommEnabled || numplayers > 1))
{ {
auto pp = Player + screenpeek; auto pp = Player + screenpeek;
FLevelStats stats{};
stats.fontscale = 1;
stats.spacing = 7;
stats.screenbottomspace = bottomy;
stats.time = Scale(PlayClock, 1000, 120);
stats.kills = Player->Kills; stats.kills = Player->Kills;
stats.maxkills = TotalKillable; stats.maxkills = TotalKillable;
stats.frags = -1; stats.frags = -1;
stats.secrets = Player->SecretsFound; stats.secrets = Player->SecretsFound;
stats.maxsecrets = LevelSecrets; stats.maxsecrets = LevelSecrets;
stats.font = SmallFont;
stats.letterColor = CR_RED; stats.letterColor = CR_RED;
stats.standardColor = CR_TAN; stats.standardColor = CR_TAN;
@ -967,10 +955,10 @@ public:
} }
else if (hud_size == Hud_full) else if (hud_size == Hud_full)
{ {
align = DI_SCREEN_CENTER_TOP; align = DI_SCREEN_CENTER_BOTTOM;
inv_x = -80 * hud_scale; inv_x = -80 * hud_scale;
inv_y = -70 * hud_scale; inv_y = -40 * hud_scale;
DrawHUD2(); // todo: Implement a proper view for this DrawHUD2();
} }
else if (hud_size == Hud_Mini) else if (hud_size == Hud_Mini)
{ {