From 5d2e638e8ad0b83eb848acfda94db1180e2b2bcf Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 14 Nov 2018 01:27:01 +0000 Subject: [PATCH] final menu tweaks before i fall asleep in my chair --- src/f_finale.c | 8 ++++++++ src/m_menu.c | 31 +++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 24ebf3ab..bb3dc7c0 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -265,6 +265,14 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset void F_StartIntro(void) { + if (gamestate) + { + F_WipeStartScreen(); + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + F_WipeEndScreen(); + F_RunWipe(wipedefs[wipe_level_final], false); + } + if (introtoplay) { if (!cutscenes[introtoplay - 1]) diff --git a/src/m_menu.c b/src/m_menu.c index 6f42d4fc..3253fa03 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4277,7 +4277,8 @@ static void M_DrawImageDef(void) } else { - INT32 x = ((itemOn ? 3 : 1)*BASEVIDWIDTH)>>2, y = (BASEVIDHEIGHT>>1) - 4; + INT32 x = BASEVIDWIDTH>>1, y = (BASEVIDHEIGHT>>1) - 4; + x += (itemOn ? 1 : -1)*((BASEVIDWIDTH>>2) + 10); V_DrawCenteredString(x, y-10, highlightflags, "USE ARROW KEYS"); V_DrawCharacter(x - 10 - (skullAnimCounter/5), y, '\x1C' | highlightflags, false); // left arrow @@ -4470,7 +4471,7 @@ static char *M_AddonsHeaderPath(void) return header+len; } -#define UNEXIST S_StartSound(NULL, sfx_lose);\ +#define UNEXIST S_StartSound(NULL, sfx_s26d);\ M_SetupNextMenu(MISC_AddonsDef.prevMenu);\ M_StartMessage(va("\x82%s\x80\nThis folder no longer exists!\nAborting to main menu.\n\n(Press a key)\n", M_AddonsHeaderPath()),NULL,MM_NOTHING) @@ -4498,7 +4499,7 @@ static boolean M_AddonsRefresh(void) if (refreshdirmenu & REFRESHDIR_NOTLOADED) { - S_StartSound(NULL, sfx_lose); + S_StartSound(NULL, sfx_s26d); if (refreshdirmenu & REFRESHDIR_MAX) message = va("%c%s\x80\nMaximum number of add-ons reached.\nA file could not be loaded.\nIf you want to play with this add-on, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname); else @@ -4506,7 +4507,7 @@ static boolean M_AddonsRefresh(void) } else if (refreshdirmenu & (REFRESHDIR_WARNING|REFRESHDIR_ERROR)) { - S_StartSound(NULL, sfx_skid); + S_StartSound(NULL, sfx_s224); message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings")); } @@ -4516,7 +4517,7 @@ static boolean M_AddonsRefresh(void) return true; } - S_StartSound(NULL, sfx_strpst); + S_StartSound(NULL, sfx_s221); CLEARNAME; } @@ -4774,7 +4775,7 @@ static void M_HandleAddons(INT32 choice) { boolean refresh = true; if (!dirmenu[dir_on[menudepthleft]]) - S_StartSound(NULL, sfx_lose); + S_StartSound(NULL, sfx_s26d); else { switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE]) @@ -4788,7 +4789,7 @@ static void M_HandleAddons(INT32 choice) if (!preparefilemenu(false)) { - S_StartSound(NULL, sfx_skid); + S_StartSound(NULL, sfx_s224); M_StartMessage(va("%c%s\x80\nThis folder is empty.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING); menupath[menupathindex[++menudepthleft]] = 0; @@ -4807,7 +4808,7 @@ static void M_HandleAddons(INT32 choice) } else { - S_StartSound(NULL, sfx_lose); + S_StartSound(NULL, sfx_s26d); M_StartMessage(va("%c%s\x80\nThis folder is too deep to navigate to!\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING); menupath[menupathindex[menudepthleft]] = 0; } @@ -4829,7 +4830,7 @@ static void M_HandleAddons(INT32 choice) break; case EXT_LUA: #ifndef HAVE_BLUA - S_StartSound(NULL, sfx_lose); + S_StartSound(NULL, sfx_s26d); M_StartMessage(va("%c%s\x80\nThis copy of SRB2 was compiled\nwithout support for .lua files.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING); break; #endif @@ -4841,7 +4842,7 @@ static void M_HandleAddons(INT32 choice) COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING)); break; default: - S_StartSound(NULL, sfx_lose); + S_StartSound(NULL, sfx_s26d); } } if (refresh) @@ -8445,6 +8446,8 @@ static void M_EraseDataResponse(INT32 ch) if (ch != 'y' && ch != KEY_ENTER) return; + S_StartSound(NULL, sfx_itrole); // bweh heh heh + // Delete the data if (erasecontext == 2) { @@ -8903,10 +8906,10 @@ static void M_ChangecontrolResponse(event_t *ev) G_CheckDoubleUsage(ch); setupcontrols[control][found] = ch; } - S_StartSound(NULL, sfx_strpst); + S_StartSound(NULL, sfx_s221); } else - S_StartSound(NULL, sfx_skid); + S_StartSound(NULL, sfx_s224); M_StopMessage(0); } @@ -8956,7 +8959,7 @@ static void M_ToggleSFX(INT32 choice) { sound_disabled = false; S_InitSfxChannels(cv_soundvolume.value); - S_StartSound(NULL, sfx_strpst); + S_StartSound(NULL, sfx_s221); //M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING); } else @@ -9632,7 +9635,7 @@ static void M_HandleMonitorToggles(INT32 choice) #ifdef ITEMTOGGLEBOTTOMRIGHT if (currentMenu->menuitems[itemOn].alphaKey == 255) { - //S_StartSound(NULL, sfx_lose); + //S_StartSound(NULL, sfx_s26d); if (!shitsfree) { shitsfree = TICRATE;