Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heretic/Hexen: Fix translucent numbers in Automap-Statusbar #1288

Merged
merged 2 commits into from
Mar 26, 2025
Merged

Heretic/Hexen: Fix translucent numbers in Automap-Statusbar #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9bd140
He: Check for SB_Translucent after RenderPlayerView
Noseey Mar 23, 2025
38987c3
Merge branch 'fabiangreffrath:master' into He_AM_Translucency_fix
Noseey Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/heretic/am_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,11 +1991,14 @@ void AM_Drawer(void)
numepisodes = 3;
}

// [crispy] check for translucent HUD
SB_Translucent(TRANSLUCENT_HUD && (!automapactive || crispy->automapoverlay));
if (gameepisode <= numepisodes && gamemap < 10)
{
level_name = LevelNames[(gameepisode - 1) * 9 + gamemap - 1];
MN_DrTextA(DEH_String(level_name), 20, 145);
}
SB_Translucent(false);
// I_Update();
// V_MarkRect(f_x, f_y, f_w, f_h);
}
4 changes: 2 additions & 2 deletions src/heretic/d_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ void D_Display(void)
case GS_LEVEL:
if (!gametic)
break;
// [crispy] check for translucent HUD
SB_Translucent(TRANSLUCENT_HUD && (!automapactive || crispy->automapoverlay));
if (automapactive && !crispy->automapoverlay)
{
// [crispy] update automap while playing
Expand All @@ -287,6 +285,8 @@ void D_Display(void)
AM_Drawer();
BorderNeedRefresh = true;
}
// [crispy] check for translucent HUD
SB_Translucent(TRANSLUCENT_HUD && (!automapactive || crispy->automapoverlay));
CT_Drawer();
UpdateState |= I_FULLVIEW;
SB_Drawer();
Expand Down
4 changes: 3 additions & 1 deletion src/hexen/am_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,6 +1845,8 @@ void AM_Drawer(void)
AM_drawGrid(GRIDCOLORS);
AM_drawWalls();
AM_drawPlayers();
// [crispy] check for translucent HUD
SB_Translucent(TRANSLUCENT_HUD && (!automapactive || crispy->automapoverlay));
DrawWorldTimer();

if (cheating == 2)
Expand All @@ -1853,8 +1855,8 @@ void AM_Drawer(void)
// AM_drawCrosshair(XHAIRCOLORS);
// AM_drawMarks();
// if(gameskill == sk_baby) AM_drawkeys();

MN_DrTextA(P_GetMapName(gamemap), 38, 144);
SB_Translucent(false);
if (ShowKills && netgame && deathmatch)
{
AM_DrawDeathmatchStats();
Expand Down
4 changes: 2 additions & 2 deletions src/hexen/h2_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,8 +1117,6 @@ static void DrawAndBlit(void)
{
break;
}
// [crispy] check for translucent HUD
SB_Translucent(TRANSLUCENT_HUD && (!automapactive || crispy->automapoverlay));
if (automapactive && !crispy->automapoverlay)
{
// [crispy] update automap while playing
Expand All @@ -1134,6 +1132,8 @@ static void DrawAndBlit(void)
AM_Drawer();
BorderNeedRefresh = true;
}
// [crispy] check for translucent HUD
SB_Translucent(TRANSLUCENT_HUD && (!automapactive || crispy->automapoverlay));
CT_Drawer();
UpdateState |= I_FULLVIEW;
SB_Drawer();
Expand Down
Loading