From d3339df85303582801f1c92d8967f50b37e20901 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 26 Feb 2024 22:00:53 +0100 Subject: [PATCH] toggle for showing nametags during spectating --- src/d_netcmd.c | 2 ++ src/d_netcmd.h | 1 + src/k_kart.c | 2 +- src/m_menu.c | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 2703b61d5..a745a6979 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -540,6 +540,7 @@ consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_co consvar_t cv_nametaghop = {"kartnametaghop", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_nametagscore = {"kartnametagscore", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_shownametagfinish = {"kartshownametagfinished", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_shownametagspectator = {"kartshownametagspectator", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t driftgaugeoffset_cons_t[] = { {-FRACUNIT*128, "MIN"}, {FRACUNIT*128, "MAX"}, {0, NULL}}; @@ -1156,6 +1157,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_nametaghop); CV_RegisterVar(&cv_nametagscore); CV_RegisterVar(&cv_shownametagfinish); + CV_RegisterVar(&cv_shownametagspectator); CV_RegisterVar(&cv_driftgauge); CV_RegisterVar(&cv_driftgaugeofs); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 191540f81..e64bba665 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -189,6 +189,7 @@ extern consvar_t cv_nametagrestat; extern consvar_t cv_nametaghop; extern consvar_t cv_nametagscore; extern consvar_t cv_shownametagfinish; +extern consvar_t cv_shownametagspectator; extern consvar_t cv_driftgauge; extern consvar_t cv_driftgaugeofs; diff --git a/src/k_kart.c b/src/k_kart.c index 99e64f098..faab4b719 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9096,7 +9096,7 @@ static void K_drawNameTags(void) patch_t *icon; INT32 hudtransflag = V_LocalTransFlag(); - if (!stplyr->mo || stplyr->spectator || splitscreen || (stplyr->exiting && !cv_shownametagfinish.value)) + if (!stplyr->mo || (stplyr->spectator && !cv_shownametagspectator.value) || splitscreen || (stplyr->exiting && !cv_shownametagfinish.value)) return; for (i = 0; i < MAXPLAYERS; i++) diff --git a/src/m_menu.c b/src/m_menu.c index 0e5673be4..3bce8141c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2243,6 +2243,7 @@ static menuitem_t OP_NametagMenu[] = {IT_STRING | IT_CVAR, NULL, "Nametag Hop", &cv_nametaghop, 90}, {IT_STRING | IT_CVAR, NULL, "Small Nametags", &cv_smallnametags, 100}, {IT_STRING | IT_CVAR, NULL, "Show Nametags after Race finish", &cv_shownametagfinish, 110}, + {IT_STRING | IT_CVAR, NULL, "Show Nametags in Spectator Mode", &cv_shownametagspectator, 130}, //{IT_STRING | IT_CVAR, NULL, "Nametag Scaling", &cv_nametagscaling, 70} }; @@ -2259,7 +2260,8 @@ static const char* OP_NametagTooltips[] = "Show stats in nametags.", "Enable Saltyhop support for nametags.", "Alternative smaller nametags.", - "Toggles being able to see Nametags after finishing a race.", + "Show Nametags after Race finish.", + "Show Nametags when you are spectating.", }; enum @@ -2276,6 +2278,7 @@ enum nt_nthop, nt_smol, nt_finish, + nt_spec, };