From 769d93c7da99c91328e3ab155c23b96e1074fa38 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 19 Dec 2023 17:34:15 +0100 Subject: [PATCH 1/5] dont prep shaders if theyre uneeded --- src/hardware/r_opengl/r_opengl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 9a1ec5941..a305365be 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -4453,12 +4453,11 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int width, int height) clearColour.alpha = 1; ClearBuffer(true, false, false, &clearColour); pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); - - // prepare shader, if it is enabled - Shader_SetUniforms(NULL, NULL, NULL, NULL); - + if (HWR_ShouldUsePaletteRendering()) { + Shader_SetUniforms(NULL, NULL, NULL, NULL); // prepare shader, if it is enabled + pglUseProgram(gl_shaderprograms[8].program); // palette shader pglActiveTexture(GL_TEXTURE1); } From dddb88db9276218288bd7b7cedf65cbd22ade33d Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 19 Dec 2023 18:58:10 +0100 Subject: [PATCH 2/5] timeout sticker uses wrong patch --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index a73656e3b..c44c0398d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9402,7 +9402,7 @@ static void K_drawBattleFullscreen(void) else { if (!K_UseColorHud()) - V_DrawFixedPatch(x< Date: Tue, 19 Dec 2023 20:08:20 +0100 Subject: [PATCH 3/5] fix some colour hud stuff not being greyed out if its unavailable --- src/m_menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 5a29186d1..d513f5988 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4437,10 +4437,10 @@ void M_Init(void) if (snw_speedo && !kartzspeedo) OP_SaturnMenu[sm_speedometer].text = "Speedometer (No PMeter)"; - - - if (!clr_hud){ // uhguauhauguuhee + + if (!clr_hud){ // uhguauhauguuhee OP_SaturnMenu[sm_colorhud].status = IT_GRAYEDOUT; + OP_SaturnMenu[sm_coloritem].status = IT_GRAYEDOUT; OP_SaturnMenu[sm_colorhud_customcolor].status = IT_GRAYEDOUT; } From 7818f17b27d3672e481fbc486d3b731e187d5909 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 19 Dec 2023 20:09:48 +0100 Subject: [PATCH 4/5] show localskin option menu in options even when youre host this is not the pause menu one, but the options one since some may still want to apply a localskin to a player for some reason --- src/m_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index d513f5988..e0c331dcd 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7778,6 +7778,8 @@ static void M_Options(INT32 choice) OP_MainMenu[4].status = OP_MainMenu[5].status = (Playing() && !(server || IsPlayerAdmin(consoleplayer))) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); OP_MainMenu[8].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_CALL); // Play credits + + OP_MainMenu[11].status = (!cv_showlocalskinmenus.value) ? (IT_DISABLED) : (IT_CALL|IT_STRING); #ifdef HAVE_DISCORDRPC OP_DataOptionsMenu[4].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); // Erase data @@ -7790,8 +7792,6 @@ static void M_Options(INT32 choice) OP_MainDef.prevMenu = currentMenu; M_SetupNextMenu(&OP_MainDef); - - OP_MainMenu[11].status = ((Playing() &&(server &&(!IsPlayerAdmin(consoleplayer)))) || (!cv_showlocalskinmenus.value)) ? (IT_DISABLED) : (IT_CALL|IT_STRING); } static void M_Manual(INT32 choice) From d66f7fb36999b3418db1059397515c8562718641 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 19 Dec 2023 20:20:42 +0100 Subject: [PATCH 5/5] forgor to add those --- src/m_menu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index e0c331dcd..1e0c28352 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2000,12 +2000,15 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 60}, {IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 65}, {IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 70}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 75}, + {IT_STRING | IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 80}, + {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 85}, + + {IT_STRING | IT_CVAR, NULL, "Midnight Channel Flicker Effect", &cv_lessflicker, 95}, - {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 85}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 90}, + {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 105}, + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 110}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 105}, // uwu + {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 120}, // uwu }; static const char* OP_SaturnTooltips[] = @@ -2023,6 +2026,8 @@ static const char* OP_SaturnTooltips[] = "Show the big 'LAP' text on a lap change.", "Show player names on the minimap.", "Minimize the player icons on the minimap.", + "Show the big Cecho Messages.", + "Show Localskin Menus.", "Disables the flicker effect on Midnight Channel.", "Options for player distortion effects.", "Move position of HUD elements.",