From 93de95d8f80360553ccafffb71a197a00069d217 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 27 Mar 2024 01:14:05 +0000 Subject: [PATCH] Add a little more info to Host menu (text only) So you have a representative idea of what each submenu contains --- src/command.c | 2 +- src/cvars.cpp | 2 +- src/menus/play-online-host.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/command.c b/src/command.c index 69dbc80a0..6d61b4dda 100644 --- a/src/command.c +++ b/src/command.c @@ -82,7 +82,7 @@ CV_PossibleValue_t CV_TrueFalse[] = {{0, "False"}, {1, "True"}, {0, NULL}}; // SRB2kart CV_PossibleValue_t kartspeed_cons_t[] = { - {KARTSPEED_AUTO, "Auto"}, + {KARTSPEED_AUTO, "Auto Gear"}, {KARTSPEED_EASY, "Gear 1"}, {KARTSPEED_NORMAL, "Gear 2"}, {KARTSPEED_HARD, "Gear 3"}, diff --git a/src/cvars.cpp b/src/cvars.cpp index 330df2f48..4519bfe8e 100644 --- a/src/cvars.cpp +++ b/src/cvars.cpp @@ -724,7 +724,7 @@ void KartFrantic_OnChange(void); consvar_t cv_kartfrantic = UnsavedNetVar("franticitems", "Off").on_off().onchange_noinit(KartFrantic_OnChange); void KartSpeed_OnChange(void); -consvar_t cv_kartspeed = UnsavedNetVar("gamespeed", "Auto").values(kartspeed_cons_t).onchange_noinit(KartSpeed_OnChange); +consvar_t cv_kartspeed = UnsavedNetVar("gamespeed", "Auto Gear").values(kartspeed_cons_t).onchange_noinit(KartSpeed_OnChange); consvar_t cv_kartusepwrlv = UnsavedNetVar("usepwrlv", "Yes").yes_no(); diff --git a/src/menus/play-online-host.c b/src/menus/play-online-host.c index 02613ef54..8ede83473 100644 --- a/src/menus/play-online-host.c +++ b/src/menus/play-online-host.c @@ -5,10 +5,41 @@ #include "../s_sound.h" #include "../z_zone.h" #include "../mserv.h" +#include "../v_video.h" +#include "../m_easing.h" static void draw_routine(void) { M_DrawRaceDifficulty(); + + INT32 tx = M_EaseWithTransition(Easing_Linear, 5 * 48); + + if (gametypes[menugametype]->rules & GTR_CIRCUIT) // TODO: speed == KARTSPEED_AUTO + { + V_DrawRightAlignedThinString( + 294 + tx, + 84, + highlightflags, + va("(%s)", cv_kartspeed.string) + ); + } + else + { + V_DrawRightAlignedThinString( + 294 + tx, + 84, + highlightflags, + "(Time/Points)" + ); + } + + V_DrawRightAlignedThinString( + 294 + tx, + 98, + !CV_IsSetToDefault(&cv_advertise) ? warningflags : highlightflags, + va("(Advertise: %s)", cv_advertise.string) + ); + M_DrawMasterServerReminder(); }