From d4f58a885bf1ee5a25ffcd6328143dff8fed72eb Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 2 Dec 2025 20:07:46 +0100 Subject: [PATCH] add toggle to let console prints show in main menus if you want this for some reason --- src/console.c | 5 ++++- src/console.h | 1 + src/m_menudefs.c | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/console.c b/src/console.c index d3c2623f4..92c9dabc4 100644 --- a/src/console.c +++ b/src/console.c @@ -169,6 +169,8 @@ static CV_PossibleValue_t menuhighlight_cons_t[] = }; consvar_t cons_menuhighlight = {"menuhighlight", "Gametype Default", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static void CON_Print(char *msg); // @@ -426,6 +428,7 @@ void CON_Init(void) CV_RegisterVar(&cons_backpic); CV_RegisterVar(&cons_backcolor); CV_RegisterVar(&cons_menuhighlight); + CV_RegisterVar(&cons_consoleprintinmenu); COM_AddCommand("bind", CONS_Bind_f); } else @@ -1590,7 +1593,7 @@ void CON_Drawer(void) if (con_curlines > 0) CON_DrawConsole(); else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS - || gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS) + || gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS || (cons_consoleprintinmenu.value && gamestate == GS_TITLESCREEN)) CON_DrawHudlines(); Unlock_state(); diff --git a/src/console.h b/src/console.h index 79af2e48f..4245f8d31 100644 --- a/src/console.h +++ b/src/console.h @@ -36,6 +36,7 @@ extern INT32 con_destlines; extern UINT32 con_scalefactor; // console text scale factor extern consvar_t cons_backcolor, cons_menuhighlight; +extern consvar_t cons_consoleprintinmenu; extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\ *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap; diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 16991f629..7121f2065 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1325,13 +1325,14 @@ static menuitem_t OP_HUDOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Menu Highlights", &cons_menuhighlight, 95}, // highlight info - (GOOD HIGHLIGHT, WARNING HIGHLIGHT) - 110 (see M_DrawHUDOptions) - {IT_STRING | IT_CVAR, NULL, "Console Text Size", &cv_constextsize, 120}, + {IT_STRING | IT_CVAR, NULL, "Console Text Size", &cv_constextsize, 120}, + {IT_STRING | IT_CVAR, NULL, "Show Console Prints in Menu",&cons_consoleprintinmenu, 130}, - {IT_STRING | IT_CVAR, NULL, "Show Track Addon Name", &cv_showtrackaddon, 135}, + {IT_STRING | IT_CVAR, NULL, "Show Track Addon Name", &cv_showtrackaddon, 145}, - {IT_STRING | IT_CVAR, NULL, "Show All Maps", &cv_showallmaps, 145}, + {IT_STRING | IT_CVAR, NULL, "Show All Maps", &cv_showallmaps, 155}, - {IT_STRING | IT_CVAR, NULL, "2D character select", &cv_skinselectmenu, 155}, + {IT_STRING | IT_CVAR, NULL, "2D character select", &cv_skinselectmenu, 165}, }; static menuitem_t OP_CamOptionsMenu[] =