From 5b2776c367e752cebc9b8209ab7cd7f1cc03e589 Mon Sep 17 00:00:00 2001 From: JadenArc Date: Sat, 5 Nov 2022 19:35:49 -0500 Subject: [PATCH] #5.1 - Miscellaneous HUD changes --- src/m_menu.c | 18 +++++++++++------- src/st_stuff.c | 30 +++++++++++++++--------------- src/y_inter.c | 30 ++++++++++++++---------------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 89fa33fd0..7c0fc70c0 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3303,18 +3303,20 @@ void M_Drawer(void) // ... but only in the MAIN MENU. I'm a picky bastard. if (currentMenu == &MainDef) { + INT32 flags = V_NOSCALESTART|V_TRANSLUCENT|V_6WIDTHSPACE|V_ALLOWLOWERCASE; + if (customversionstring[0] != '\0') { - V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:"); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, customversionstring); + V_DrawThinString(vid.dupx, vid.height - 17*vid.dupy, flags|V_YELLOWMAP, "Mod version:"); + V_DrawThinString(vid.dupx, vid.height - 9*vid.dupy, flags, customversionstring); } else { #ifdef DEVELOP // Development -- show revision / branch info - V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); + V_DrawThinString(vid.dupx, vid.height - 17*vid.dupy, flags, compbranch); + V_DrawThinString(vid.dupx, vid.height - 9*vid.dupy, flags, comprevision); #else // Regular build - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING)); + V_DrawThinString(vid.dupx, vid.height - 9*vid.dupy, flags, va("%s", VERSIONSTRING)); #endif } } @@ -8817,19 +8819,21 @@ static void M_HandleServerPage(INT32 choice) case KEY_ENTER: case KEY_RIGHTARROW: - S_StartSound(NULL, sfx_menu1); if ((serverlistpage + 1) * SERVERS_PER_PAGE < serverlistcount) { oldserverlistpage = serverlistpage++; serverlistslidex = BASEVIDWIDTH; + + S_StartSoundAtVolume(NULL, sfx_s3kb7, 128); } break; case KEY_LEFTARROW: - S_StartSound(NULL, sfx_menu1); if (serverlistpage > 0) { oldserverlistpage = serverlistpage--; serverlistslidex = -(BASEVIDWIDTH); + + S_StartSoundAtVolume(NULL, sfx_s3kb7, 128); } break; diff --git a/src/st_stuff.c b/src/st_stuff.c index 3b9e6f0b4..7d8c4cf7a 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1966,7 +1966,7 @@ static void ST_overlayDrawer(void) strlcpy(name, player_names[stplyr-players], 13);*/ // Show name of player being displayed - V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, 0, M_GetText("VIEWPOINT:")); + V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, V_ALLOWLOWERCASE, M_GetText("Viewpoint:")); V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_ALLOWLOWERCASE, player_names[stplyr-players]); } } @@ -1974,7 +1974,7 @@ static void ST_overlayDrawer(void) { if (!splitscreen) { - V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, V_HUDTRANSHALF, M_GetText("VIEWPOINT:")); + V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, V_HUDTRANSHALF|V_ALLOWLOWERCASE|V_YELLOWMAP, M_GetText("Viewpoint:")); V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_HUDTRANSHALF|V_ALLOWLOWERCASE, player_names[stplyr-players]); } else if (splitscreen == 1) @@ -1982,12 +1982,12 @@ static void ST_overlayDrawer(void) char name[MAXPLAYERNAME+12]; INT32 y = (stplyr == &players[displayplayers[0]]) ? 4 : BASEVIDHEIGHT/2-12; - sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]); - V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name); + sprintf(name, "\x82VIEWPOINT:\x80 %s", player_names[stplyr-players]); + V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|V_6WIDTHSPACE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name); } else if (splitscreen) { - V_DrawCenteredThinString((vid.width/vid.dupx)/4, BASEVIDHEIGHT/2 - 12, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT), player_names[stplyr-players]); + V_DrawCenteredThinString((vid.width/vid.dupx)/4, BASEVIDHEIGHT/2 - 12, V_HUDTRANSHALF|V_ALLOWLOWERCASE|V_6WIDTHSPACE|K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT), player_names[stplyr-players]); } } } @@ -2069,15 +2069,15 @@ static void ST_overlayDrawer(void) if (splitscreen) { INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT); - V_DrawThinString(2, (BASEVIDHEIGHT/2)-20, V_HUDTRANSHALF|V_YELLOWMAP|splitflags, M_GetText("- SPECTATING -")); - V_DrawThinString(2, (BASEVIDHEIGHT/2)-10, V_HUDTRANSHALF|splitflags, itemtxt); + V_DrawThinString(2, (BASEVIDHEIGHT/2)-20, V_HUDTRANSHALF|V_YELLOWMAP|V_6WIDTHSPACE|splitflags, M_GetText("- SPECTATING -")); + V_DrawThinString(2, (BASEVIDHEIGHT/2)-10, V_HUDTRANSHALF|V_ALLOWLOWERCASE|V_6WIDTHSPACE|splitflags, itemtxt); } else { V_DrawString(2, BASEVIDHEIGHT-40, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF|V_YELLOWMAP, M_GetText("- SPECTATING -")); - V_DrawString(2, BASEVIDHEIGHT-30, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, itemtxt); - V_DrawString(2, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, M_GetText("Accelerate - Float")); - V_DrawString(2, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, M_GetText("Brake - Sink")); + V_DrawString(2, BASEVIDHEIGHT-30, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE|V_HUDTRANSHALF, itemtxt); + V_DrawString(2, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE|V_HUDTRANSHALF, M_GetText("Accelerate - Float")); + V_DrawString(2, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE|V_HUDTRANSHALF, M_GetText("Brake - Sink")); } } } @@ -2088,15 +2088,15 @@ static void ST_overlayDrawer(void) switch (demo.savemode) { case DSM_NOTSAVING: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|(G_BattleGametype() ? V_REDMAP : V_SKYMAP), "Look Backward: Save replay"); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|(G_BattleGametype() ? V_REDMAP : V_SKYMAP), "Look Backward: Save replay"); break; case DSM_WILLAUTOSAVE: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|(G_BattleGametype() ? V_REDMAP : V_SKYMAP), "Replay will be saved. (Look Backward: Change title)"); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|(G_BattleGametype() ? V_REDMAP : V_SKYMAP), "Replay will be saved. (Look Backward: Change title)"); break; case DSM_WILLSAVE: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|(G_BattleGametype() ? V_REDMAP : V_SKYMAP), "Replay will be saved."); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|(G_BattleGametype() ? V_REDMAP : V_SKYMAP), "Replay will be saved."); break; case DSM_TITLEENTRY: @@ -2133,8 +2133,8 @@ void ST_DrawDemoTitleEntry(void) V_DrawString(x + 38, y - 16, V_ALLOWLOWERCASE, "Enter the name of the replay."); M_DrawTextBox(x + 50, y + 20, 20, 1); - V_DrawThinString(x + 58, y + 28, V_ALLOWLOWERCASE, "Escape - Cancel"); - V_DrawRightAlignedThinString(x + 220, y + 28, V_ALLOWLOWERCASE, "Enter - Confirm"); + V_DrawThinString(x + 58, y + 28, V_ALLOWLOWERCASE|V_6WIDTHSPACE, va("[%cESC%c] Cancel", 0x82, 0x80)); + V_DrawRightAlignedThinString(x + 220, y + 28, V_ALLOWLOWERCASE|V_6WIDTHSPACE, va("[%cEnter%c] Confirm", 0x82, 0x80)); #undef x #undef y } diff --git a/src/y_inter.c b/src/y_inter.c index 9eaf4e1b2..b8e35c209 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -212,7 +212,7 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32)) ; else if ((data.match.rankingsmode = (boolean)rankingsmode)) { - sprintf(data.match.levelstring, "* Total Rankings *"); + sprintf(data.match.levelstring, "\x82* \x80Total Rankings \x82*"); data.match.encore = false; } else @@ -223,12 +223,12 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32)) if (mapheaderinfo[prevmap]->actnum[0]) snprintf(data.match.levelstring, sizeof data.match.levelstring, - "* %s %s *", + "\x82*\x80 %s %s \x82*", mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum); else snprintf(data.match.levelstring, sizeof data.match.levelstring, - "* %s *", + "\x82*\x80 %s \x82*", mapheaderinfo[prevmap]->lvlttl); } else @@ -237,12 +237,12 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32)) if (mapheaderinfo[prevmap]->actnum[0]) snprintf(data.match.levelstring, sizeof data.match.levelstring, - "* %s %s %s *", + "\x82*\x80 %s %s %s \x82*", mapheaderinfo[prevmap]->lvlttl, zonttl, mapheaderinfo[prevmap]->actnum); else snprintf(data.match.levelstring, sizeof data.match.levelstring, - "* %s %s *", + "\x82*\x80 %s %s \x82*", mapheaderinfo[prevmap]->lvlttl, zonttl); } @@ -436,16 +436,17 @@ void Y_IntermissionDrawer(void) timeheader = (intertype == int_race ? "TIME" : "SCORE"); // draw the level name - V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12, 0, data.match.levelstring); + V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12, V_ALLOWLOWERCASE, data.match.levelstring); + V_DrawFill((x-3) - duptweak, 34, dupadjust-2, 1, 0); + V_DrawFill((x-3) - duptweak, 182, dupadjust-2, 1, 0); if (data.match.encore) - V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12-8, hilicol, "ENCORE MODE"); + V_DrawCenteredSmallString(-4 + x + BASEVIDWIDTH/2, 17, hilicol | V_ALLOWLOWERCASE, "Encore Mode"); if (data.match.numplayers > NUMFORNEWCOLUMN) { V_DrawFill(x+156, 24, 1, 158, 0); - V_DrawFill((x-3) - duptweak, 182, dupadjust-2, 1, 0); V_DrawCenteredString(x+6+(BASEVIDWIDTH/2), 24, hilicol, "#"); V_DrawString(x+36+(BASEVIDWIDTH/2), 24, hilicol, "NAME"); @@ -568,27 +569,24 @@ void Y_IntermissionDrawer(void) dotimer: if (timer) { - char *string; INT32 tickdown = (timer+1)/TICRATE; + char *string = va("%s starts in %d.%02d...", cv_advancemap.string, tickdown, G_TicsToCentiseconds(tickdown)); if (multiplayer && demo.playback) - string = va("Replay ends in %d", tickdown); - else - string = va("%s starts in %d", cv_advancemap.string, tickdown); + string = va("Replay ends in %d.%02d...", tickdown, G_TicsToCentiseconds(tickdown)); - V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol, - string); + V_DrawCenteredThinString(BASEVIDWIDTH/2, 189, hilicol|V_ALLOWLOWERCASE|V_6WIDTHSPACE, string); } if ((demo.recording || demo.savemode == DSM_SAVED) && !demo.playback) switch (demo.savemode) { case DSM_NOTSAVING: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|hilicol, "Look Backward: Save replay"); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|hilicol, "Look Backward: Save replay"); break; case DSM_SAVED: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|hilicol, "Replay saved!"); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|hilicol, "Replay saved!"); break; case DSM_TITLEENTRY: