From 3e6a66b12d277aaba3c18b15169268f3d149191d Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 26 Feb 2024 21:20:53 +0100 Subject: [PATCH] add toggle for showing nametags after you finished a race off by default to match sg nametags --- src/d_netcmd.c | 2 ++ src/d_netcmd.h | 1 + src/k_kart.c | 6 +++--- src/m_menu.c | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 24e8a4cd7..d12af5767 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -538,6 +538,7 @@ consvar_t cv_showownnametag = {"kartnametagshowown", "Off", CV_SAVE, CV_OnOff, N consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_cons_t, Nametag_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; 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}; static CV_PossibleValue_t skinselectspin_cons_t[] = { {0, "Off"}, {1, "Slow"}, {2, "2"}, {3, "3"}, {4, "4"}, {5, "5"}, {6, "6"}, {7, "7"}, {8, "8"}, {9, "9"}, {10, "Fast"}, {SKINSELECTSPIN_PAIN, "Pain"}, {0, NULL}}; @@ -1142,6 +1143,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_nametagrestat); CV_RegisterVar(&cv_nametaghop); CV_RegisterVar(&cv_nametagscore); + CV_RegisterVar(&cv_shownametagfinish); CV_RegisterVar(&cv_perfstats); CV_RegisterVar(&cv_ps_thinkframe_page); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 1e0a7a847..642e496e6 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -185,6 +185,7 @@ extern consvar_t cv_smallnametags; extern consvar_t cv_nametagrestat; extern consvar_t cv_nametaghop; extern consvar_t cv_nametagscore; +extern consvar_t cv_shownametagfinish; #define SKINSELECTSPIN_PAIN 25 extern consvar_t cv_skinselectspin; diff --git a/src/k_kart.c b/src/k_kart.c index 1ac731588..ec4e2da66 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9037,7 +9037,7 @@ static void K_drawNameTags(void) patch_t *icon; INT32 hudtransflag = V_LocalTransFlag(); - if (!stplyr->mo || stplyr->spectator || splitscreen) + if (!stplyr->mo || stplyr->spectator || splitscreen || (stplyr->exiting && !cv_shownametagfinish.value)) return; for (i = 0; i < MAXPLAYERS; i++) @@ -9105,7 +9105,7 @@ static void K_drawNameTags(void) //Check for negative screencoords if (pos.x == -1 || pos.y == -1) continue; - + tagsdisplayed += 1; if (tagsdisplayed > cv_nametagmaxplayers.value) @@ -9219,7 +9219,7 @@ static void K_drawNameTags(void) } if (cv_nametagfacerank.value) - { + { V_DrawMappedPatch(namex, namey - dup*(icon->height+1), vflags, icon, cm); namex += dup*(icon->height+1); // add offset to other stuff } diff --git a/src/m_menu.c b/src/m_menu.c index 350f510d6..f8c30ed09 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -367,7 +367,6 @@ menu_t OP_AdvancedBirdDef; // Chaotic menu_t OP_NametagDef; -//menu_t OP_OGLShadowsDef; #define numaddonsshown 4 @@ -2227,6 +2226,7 @@ static menuitem_t OP_NametagMenu[] = {IT_STRING | IT_CVAR, NULL, "Nametag Restat", &cv_nametagrestat, 80}, {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, "Nametag Scaling", &cv_nametagscaling, 70} }; @@ -2243,6 +2243,7 @@ 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.", }; enum @@ -2258,6 +2259,7 @@ enum nt_ntrestat, nt_nthop, nt_smol, + nt_finish, };