mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-28 15:46:06 -04:00
fix automap widgets overlap hud elements in overlay mode (#222)
This commit is contained in:
parent
54817de3b3
commit
d6939ab3ef
@ -757,14 +757,14 @@ void HU_Drawer(void)
|
|||||||
fixed_t x,y,z; // killough 10/98:
|
fixed_t x,y,z; // killough 10/98:
|
||||||
void AM_Coordinates(const mobj_t *, fixed_t *, fixed_t *, fixed_t *);
|
void AM_Coordinates(const mobj_t *, fixed_t *, fixed_t *, fixed_t *);
|
||||||
|
|
||||||
if (automapactive && !(hud_distributed && automapoverlay)) // [FG] moved here
|
if (automapactive && !(hud_displayed && automapoverlay)) // [FG] moved here
|
||||||
{
|
{
|
||||||
// map title
|
// map title
|
||||||
HUlib_drawTextLine(&w_title, false);
|
HUlib_drawTextLine(&w_title, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// [FG] draw player coords widget
|
// [FG] draw player coords widget
|
||||||
if ((automapactive && map_player_coords == 1) || map_player_coords == 2)
|
if (automapactive && !(hud_distributed && automapoverlay) && map_player_coords)
|
||||||
{
|
{
|
||||||
// killough 10/98: allow coordinates to display non-following pointer
|
// killough 10/98: allow coordinates to display non-following pointer
|
||||||
AM_Coordinates(plr->mo, &x, &y, &z);
|
AM_Coordinates(plr->mo, &x, &y, &z);
|
||||||
@ -1450,7 +1450,7 @@ void HU_Ticker(void)
|
|||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
// [crispy] move map title to the bottom
|
// [crispy] move map title to the bottom
|
||||||
if (automapoverlay && screenblocks >= 11)
|
if (automapoverlay && screenblocks >= 11 && !hud_displayed)
|
||||||
w_title.y = HU_TITLEY + ST_HEIGHT;
|
w_title.y = HU_TITLEY + ST_HEIGHT;
|
||||||
else
|
else
|
||||||
w_title.y = HU_TITLEY;
|
w_title.y = HU_TITLEY;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user