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

- give Exhumed some automap labels as well.

Browse source 
This game didn't have them originally so here the 'native' mode does not exist.
This commit is contained in:
Christoph Oelckers 2020-08-25 00:27:14 +02:00
parent 7c1e64757a
commit 1a633ce6a6
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/core/statusbar.cpp
View file

@ -766,7 +766,7 @@ void DBaseStatusBar::PrintAutomapInfo(FLevelStats& stats)
double spacing = stats.spacing * (am_textfont ? *hud_statscale : 1); double spacing = stats.spacing * (am_textfont ? *hud_statscale : 1);
if (am_nameontop) if (am_nameontop)
{ {
y = spacing; y = spacing + 1;
} }
else if (stats.screenbottomspace < 0) else if (stats.screenbottomspace < 0)
{ {
@ -776,13 +776,14 @@ void DBaseStatusBar::PrintAutomapInfo(FLevelStats& stats)
{ {
y = 200 - stats.screenbottomspace - spacing; y = 200 - stats.screenbottomspace - spacing;
} }
const auto &volname = gVolumeNames[volfromlevelnum(currentLevel->levelNumber)];
if (volname.IsEmpty() && am_nameontop) y = 1;
DrawText(twod, stats.font, stats.standardColor, 2 * hud_statscale, y, mapname, DTA_FullscreenScale, FSMode_ScaleToHeight, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawText(twod, stats.font, stats.standardColor, 2 * hud_statscale, y, mapname, DTA_FullscreenScale, FSMode_ScaleToHeight, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_ScaleX, scale, DTA_ScaleY, scale, DTA_KeepRatio, true, TAG_DONE); DTA_ScaleX, scale, DTA_ScaleY, scale, DTA_KeepRatio, true, TAG_DONE);
y -= spacing; y -= spacing;
if (!(currentLevel->flags & MI_USERMAP) && !(g_gameType & GAMEFLAG_PSEXHUMED) && volname.IsNotEmpty())
if (!(currentLevel->flags & MI_USERMAP) && !(g_gameType & GAMEFLAG_PSEXHUMED)) DrawText(twod, stats.font, stats.standardColor, 2 * hud_statscale, y, GStrings.localize(volname),
DrawText(twod, stats.font, stats.standardColor, 2 * hud_statscale, y, GStrings.localize(gVolumeNames[volfromlevelnum(currentLevel->levelNumber)]),
DTA_FullscreenScale, FSMode_ScaleToHeight, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, FSMode_ScaleToHeight, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_ScaleX, scale, DTA_ScaleY, scale, DTA_KeepRatio, true, TAG_DONE); DTA_ScaleX, scale, DTA_ScaleY, scale, DTA_KeepRatio, true, TAG_DONE);

25
source/exhumed/src/status.cpp
View file

@ -819,19 +819,24 @@ private:
void PrintLevelStats(int bottomy) void PrintLevelStats(int bottomy)
{ {
if (hud_stats) FLevelStats stats{};
stats.fontscale = 1.;
stats.spacing = SmallFont->GetHeight();
stats.screenbottomspace = bottomy;
stats.font = SmallFont;
stats.letterColor = CR_RED;
stats.standardColor = CR_UNTRANSLATED;
stats.time = Scale(leveltime, 1000, 30);
am_textfont = true; // Exhumed has no fallback.
if (automapMode == am_full)
{
DBaseStatusBar::PrintAutomapInfo(stats);
}
else if (hud_stats)
{ {
FLevelStats stats{};
stats.fontscale = 1.;
stats.spacing = SmallFont->GetHeight();
stats.screenbottomspace = bottomy;
stats.font = SmallFont;
stats.letterColor = CR_RED;
stats.standardColor = CR_UNTRANSLATED;
stats.completeColor = CR_DARKGREEN; stats.completeColor = CR_DARKGREEN;
stats.time = Scale(leveltime, 1000, 30);
stats.kills = nCreaturesKilled; stats.kills = nCreaturesKilled;
stats.maxkills = nCreaturesTotal; stats.maxkills = nCreaturesTotal;
stats.frags = -1; stats.frags = -1;