From cbd59a04f62368867e71ccb70f6658db30a49efe Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 21 Nov 2023 17:34:07 +0100 Subject: [PATCH] toggle for localskin menus well wanna be able to toggle things --- src/d_netcmd.c | 4 ++++ src/d_netcmd.h | 1 + src/m_menu.c | 26 +++++++++++++++----------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index f9b4dcddd..51f0aad22 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -295,6 +295,8 @@ consvar_t cv_skin4 = {"skin4", DEFAULTSKIN4, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Sk // haha I've beaten you now, ONLINE consvar_t cv_localskin = {"internal___localskin", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_showlocalskinmenus = {"showlocalskinmenus", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; INT32 cv_debug; @@ -970,6 +972,8 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_luaimmersion); CV_RegisterVar(&cv_fakelocalskin); + + CV_RegisterVar(&cv_showlocalskinmenus); //CV_RegisterVar(&cv_crosshair); //CV_RegisterVar(&cv_crosshair2); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index e21fdbb6f..d6274573a 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -166,6 +166,7 @@ extern consvar_t cv_showlapemblem; extern consvar_t cv_showviewpointtext; extern consvar_t cv_luaimmersion; extern consvar_t cv_fakelocalskin; +extern consvar_t cv_showlocalskinmenus; extern consvar_t cv_skipmapcheck; diff --git a/src/m_menu.c b/src/m_menu.c index bb5d56935..3b3c67e8c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4048,6 +4048,9 @@ void M_StartControlPanel(void) MPauseMenu[mpause_psetup].status = IT_DISABLED; MISC_ChangeTeamMenu[0].status = IT_DISABLED; MISC_ChangeSpectateMenu[0].status = IT_DISABLED; + + MPauseMenu[mpause_addlocalskins].status = IT_STRING | IT_CALL; + MPauseMenu[mpause_localskin].status = IT_STRING | IT_CALL; // Reset these in case splitscreen messes things up MPauseMenu[mpause_addons].alphaKey = 8; @@ -4069,19 +4072,20 @@ void M_StartControlPanel(void) MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL; MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL; - if (!IsPlayerAdmin(consoleplayer)) - { - MPauseMenu[mpause_addlocalskins].status = IT_DISABLED; - MPauseMenu[mpause_localskin].status = IT_DISABLED; - - MPauseMenu[mpause_options].alphaKey = 64; - MPauseMenu[mpause_title].alphaKey = 80; - MPauseMenu[mpause_quit].alphaKey = 88; - } - if (G_GametypeHasTeams()) MPauseMenu[mpause_scramble].status = IT_STRING | IT_SUBMENU; } + + if (server || (!cv_showlocalskinmenus.value)) + { + MPauseMenu[mpause_addlocalskins].status = IT_DISABLED; + MPauseMenu[mpause_localskin].status = IT_DISABLED; + + MPauseMenu[mpause_options].alphaKey = 64; + MPauseMenu[mpause_title].alphaKey = 80; + MPauseMenu[mpause_quit].alphaKey = 88; + } + if (splitscreen) { @@ -7606,7 +7610,7 @@ static void M_Options(INT32 choice) OP_MainDef.prevMenu = currentMenu; M_SetupNextMenu(&OP_MainDef); - OP_MainMenu[11].status = (Playing() &&(server &&(!IsPlayerAdmin(consoleplayer)))) ? (IT_DISABLED) : (IT_CALL|IT_STRING); + OP_MainMenu[11].status = ((Playing() &&(server &&(!IsPlayerAdmin(consoleplayer)))) || (!cv_showlocalskinmenus.value)) ? (IT_DISABLED) : (IT_CALL|IT_STRING); } static void M_Manual(INT32 choice)