From ba1de8fde04fe52821120635431c1ff5d7ec0cfb Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 23 Mar 2024 20:24:28 +0300 Subject: [PATCH 1/2] Fix NOHW compilation warning --- src/p_setup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index fa6bcc0a7..9ae36afc9 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -1434,7 +1434,9 @@ static void P_LoadRawSideDefs2(void *data) case 606: //SoM: 4/4/2000: Just colormap transfer // SoM: R_CreateColormap will only create a colormap in software mode... // Perhaps we should just call it instead of doing the calculations here. - if (rendermode == render_soft || rendermode == render_none) +#ifdef HWRENDER + if (rendermode != render_opengl) +#endif { if (msd->toptexture[0] == '#' || msd->bottomtexture[0] == '#') { From d0ad6d880a90703bfa86d3d2d210f534448152c6 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 23 Mar 2024 18:56:37 +0100 Subject: [PATCH 2/2] update saturn credits c: --- src/f_finale.c | 4 +++- src/m_menu.c | 55 ++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 49bf89254..7f86303c0 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -523,11 +523,13 @@ static const char *credits[] = { "\"Virt\"", "", "\1Saturn", - "\"Alufolie91\" aka \"Alug\"", + "\"Alug\"", "\"Indev\"", "\"Haya\"", "\"NepDisk\"", + "\"GenericHeroGuy\"", "\"Xyzzy\"", + "\"Chearii\"", " ", "\"Sunflower\" aka \"AnimeSonic\"", "\"Yuz\" aka \"Yuzler\"", diff --git a/src/m_menu.c b/src/m_menu.c index a13c21c7f..7a07f58dc 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2153,37 +2153,34 @@ static menuitem_t OP_HudOffsetMenu[] = static menuitem_t OP_SaturnCreditsMenu[] = { - {IT_HEADER, NULL, "Saturn Credits", NULL, 0}, - - {IT_HEADER, NULL, "Thanks to all contributers <3", NULL, 15}, - - {IT_STRING2+IT_SPACE, NULL, "alufolie91 aka Alug", NULL, 20}, + {IT_HEADER, NULL, "Saturn Credits", NULL, 0}, + + {IT_HEADER, NULL, "Thanks to all contributers <3", NULL, 15}, + + {IT_STRING2+IT_SPACE, NULL, "Alug", NULL, 20}, {IT_STRING2+IT_SPACE, NULL, "Indev", NULL, 30}, {IT_STRING2+IT_SPACE, NULL, "Haya", NULL, 40}, {IT_STRING2+IT_SPACE, NULL, "Nepdisk", NULL, 50}, - {IT_STRING2+IT_SPACE, NULL, "xyzzy", NULL, 60}, - {IT_STRING2+IT_SPACE, NULL, "Chearii", NULL, 70}, - - - {IT_STRING+IT_SPACE, NULL, "", NULL, 73}, // dummy text - - {IT_STRING2+IT_SPACE, NULL, "Sunflower aka AnimeSonic", NULL, 80}, - {IT_STRING2+IT_SPACE, NULL, "Yuz aka Yuzler", NULL, 90}, - {IT_STRING2+IT_SPACE, NULL, "Democrab", NULL, 100}, - {IT_STRING2+IT_SPACE, NULL, "EXpand aka Maver", NULL, 110}, - {IT_STRING2+IT_SPACE, NULL, "Nexit", NULL, 120}, - - {IT_HEADER, NULL, "Special Thanks <3", NULL, 130}, - - - {IT_STRING2+IT_SPACE, NULL, "All of Sunflower's Garden", NULL, 150}, - {IT_STRING2+IT_SPACE, NULL, "Galactice", NULL, 160}, - {IT_STRING2+IT_SPACE, NULL, "Himie and", NULL, 170}, - {IT_STRING2+IT_SPACE, NULL, "The Moe Mansion / Birdhouse Team", NULL, 180}, - + {IT_STRING2+IT_SPACE, NULL, "GenericHeroGuy", NULL, 60}, + {IT_STRING2+IT_SPACE, NULL, "xyzzy", NULL, 70}, + {IT_STRING2+IT_SPACE, NULL, "Chearii", NULL, 80}, - {IT_STRING+IT_SPACE, NULL, "", NULL, 190}, // dummy text II - {IT_STRING, NULL, "", NULL, 200}, // dummy text III + {IT_STRING+IT_SPACE, NULL, "", NULL, 83}, // dummy text + + {IT_STRING2+IT_SPACE, NULL, "Sunflower aka AnimeSonic", NULL, 90}, + {IT_STRING2+IT_SPACE, NULL, "Yuz aka Yuzler", NULL, 100}, + {IT_STRING2+IT_SPACE, NULL, "Democrab", NULL, 110}, + {IT_STRING2+IT_SPACE, NULL, "EXpand aka Maver", NULL, 120}, + {IT_STRING2+IT_SPACE, NULL, "Nexit", NULL, 130}, + + {IT_HEADER, NULL, "Special Thanks <3", NULL, 140}, + + {IT_STRING2+IT_SPACE, NULL, "All of Sunflower's Garden", NULL, 160}, + {IT_STRING2+IT_SPACE, NULL, "The Moe Mansion and Birdhouse Team", NULL, 170}, + {IT_STRING2+IT_SPACE, NULL, "Galactice for Galaxy", NULL, 180}, + + {IT_STRING+IT_SPACE, NULL, "", NULL, 190}, // dummy text II + {IT_STRING, NULL, "", NULL, 200}, // dummy text III }; static const char* OP_CreditTooltips[] = @@ -2249,7 +2246,7 @@ static menuitem_t OP_ForkedBirdMenu[] = { {IT_HEADER, NULL, "Local Skins", NULL, 0}, {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Local Skin Name", &cv_fakelocalskin, 10}, - {IT_STRING2 | IT_SPACE, NULL, "Set to None for no Local Skin", NULL, 20}, + {IT_STRING2 | IT_SPACE, NULL, "SET TO NONE FOR NO LOCAL SKIN", NULL, 20}, {IT_STRING | IT_CALL, NULL, "Apply to All Players", M_LocalSkinChange, 140}, {IT_STRING | IT_CALL, NULL, "Apply to Displaying Player", M_LocalSkinChange, 150}, {IT_STRING | IT_CALL, NULL, "Apply to Yourself", M_LocalSkinChange, 160}, @@ -4866,7 +4863,7 @@ static void M_DrawGenericMenu(void) y += STRINGHEIGHT; break; case IT_STRING2: - V_DrawString(((BASEVIDWIDTH - V_StringWidth(currentMenu->menuitems[i].text, 0))>>1), y, 0, currentMenu->menuitems[i].text); + V_DrawString(((BASEVIDWIDTH - V_StringWidth(currentMenu->menuitems[i].text, 0))>>1), y, lowercase, currentMenu->menuitems[i].text); /* FALLTHRU */ case IT_DYLITLSPACE: y += SMALLLINEHEIGHT;