AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 21:38:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

always display level title in automap overlay mode (#695)

Browse Source 
* always display level title in automap overlay mode

* fix crispy_hud

* fix show player coords widget if hud_distributed

* fix player coords widget position

* move automap widgets if multiline messages are enabled
This commit is contained in:
Roman Fomin 2022-08-10 12:56:44 +07:00 committed by GitHub
parent acdec29c96
commit d3084bfc0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/hu_stuff.c
View File

@ -1135,20 +1135,14 @@ void HU_Drawer(void)
fixed_t x,y,z; // killough 10/98:
void AM_Coordinates(const mobj_t *, fixed_t *, fixed_t *, fixed_t *);
if (automapactive &&
!(
(hud_displayed || (hud_timests && screenblocks < 11)) &&
automapoverlay
)
) // [FG] moved here
if (automapactive) // [FG] moved here
{
// map title
HUlib_drawTextLine(&w_title, false);
}
// [FG] draw player coords widget
if ((automapactive && !(hud_distributed && automapoverlay) &&
STRICTMODE(map_player_coords) == 1) ||
if ((automapactive && STRICTMODE(map_player_coords) == 1) ||
STRICTMODE(map_player_coords) == 2)
{
// killough 10/98: allow coordinates to display non-following pointer
@ -1900,15 +1894,52 @@ void HU_Ticker(void)
// [FG] calculate level stats and level time widgets
{
char *s;
const int offset_msglist = (message_list ? HU_REFRESHSPACING * (hud_msg_lines - 1) : 0);
w_title.y = HU_TITLEY;
w_coordx.y = HU_COORDX_Y;
w_coordy.y = HU_COORDY_Y;
w_coordz.y = HU_COORDZ_Y;
// [crispy] move map title to the bottom
if (automapoverlay && screenblocks >= 11 && !hud_displayed)
w_title.y = HU_TITLEY + ST_HEIGHT;
else
w_title.y = HU_TITLEY;
if (automapoverlay)
{
const int offset_timests = (hud_timests ? (hud_timests == 3 ? 2 : 1) : 0) * HU_GAPY;
const int offset_nosecrets = (hud_nosecrets ? 1 : 2) * HU_GAPY;
if (screenblocks >= 11)
{
if (hud_displayed && hud_active)
{
if (crispy_hud)
w_title.y -= offset_timests;
else
{
if (hud_distributed)
{
w_title.y += ST_HEIGHT;
w_coordx.y += 2 * HU_GAPY;
w_coordy.y += 2 * HU_GAPY;
w_coordz.y += 2 * HU_GAPY;
}
if (hud_active > 1)
w_title.y -= offset_nosecrets;
}
}
else
w_title.y += ST_HEIGHT;
}
else
w_title.y -= offset_timests;
}
if (map_level_stats)
{
w_lstatk.y = HU_LSTATK_Y + offset_msglist;
w_lstati.y = HU_LSTATI_Y + offset_msglist;
w_lstats.y = HU_LSTATS_Y + offset_msglist;
if (extrakills)
{
sprintf(hud_lstatk, "K\t\x1b%c%d/%d+%d", '0'+CR_GRAY,
@ -1940,6 +1971,8 @@ void HU_Ticker(void)
{
const int time = leveltime / TICRATE; // [FG] in seconds
w_ltime.y = HU_LTIME_Y + offset_msglist;
sprintf(hud_ltime, "%02d:%02d:%02d", time/3600, (time%3600)/60, time%60);
HUlib_clearTextLine(&w_ltime);
s = hud_ltime;

2
src/m_menu.c
View File

@ -5317,7 +5317,7 @@ boolean M_Responder (event_t* ev)
if (M_InputActivated(input_hud)) // heads-up mode
{
if (automapactive || chat_on) // jff 2/22/98
if ((automapactive && !automapoverlay) || chat_on) // jff 2/22/98
return false; // HUD mode control
if (screenSize<8) // function on default F5
while (screenSize<8 || !hud_displayed) // make hud visible