diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 138c35b3a..dd5873de5 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -539,6 +539,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}}; @@ -1155,6 +1156,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 d22a3fe8a..293bbbc75 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -186,6 +186,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; #define SKINSELECTSPIN_PAIN 25 extern consvar_t cv_skinselectspin; diff --git a/src/k_kart.c b/src/k_kart.c index b90e9a4fd..a967ef6b6 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9072,7 +9072,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 75565d046..961f597ab 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2234,6 +2234,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} }; @@ -2251,7 +2252,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 @@ -2268,6 +2270,7 @@ enum nt_nthop, nt_smol, nt_finish, + nt_spec, };