From 848d7ad8195df1d0304c7c4c07afca6c0dcd2dd8 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 5 Dec 2019 11:12:35 +0000
Subject: [PATCH] Allow the NiGHTS Attack menu to have the levels selectable
left-and-right-wise, just like Record Attack.
---
src/m_menu.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/m_menu.c b/src/m_menu.c
index edba61f30f..7bc4127c2c 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -859,7 +859,7 @@ static menuitem_t SP_NightsAttackLevelSelectMenu[] =
// Single Player Nights Attack
static menuitem_t SP_NightsAttackMenu[] =
{
- {IT_STRING|IT_CALL, NULL, "Level Select...", &M_NightsAttackLevelSelect, 52},
+ {IT_STRING|IT_KEYHANDLER, NULL, "Level Select...", &M_HandleTimeAttackLevelSelect, 52},
{IT_STRING|IT_CVAR, NULL, "Show Records For", &cv_dummymares, 62},
{IT_DISABLED, NULL, "Guest Option...", &SP_NightsGuestReplayDef, 100},
@@ -9273,7 +9273,10 @@ static void M_HandleTimeAttackLevelSelect(INT32 choice)
break;
case KEY_ENTER:
- M_TimeAttackLevelSelect(0);
+ if (levellistmode == LLM_NIGHTSATTACK)
+ M_NightsAttackLevelSelect(0);
+ else
+ M_TimeAttackLevelSelect(0);
break;
case KEY_ESCAPE:
@@ -9405,7 +9408,24 @@ void M_DrawNightsAttackMenu(void)
else
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
- V_DrawSmallScaledPatch(208, 32+lsheadingheight, 0, PictureOfLevel);
+ y = 32+lsheadingheight;
+ V_DrawSmallScaledPatch(208, y, 0, PictureOfLevel);
+
+ // Draw press ESC to exit string on main nights attack menu
+ if (currentMenu == &SP_NightsAttackDef)
+ {
+ if (itemOn == nalevel)
+ {
+ /* Draw arrows !! */
+ y = y + 25 - 4;
+ V_DrawCharacter(208 - 10 - (skullAnimCounter/5), y,
+ '\x1C' | V_YELLOWMAP, false);
+ V_DrawCharacter(208 + 80 + 2 + (skullAnimCounter/5), y,
+ '\x1D' | V_YELLOWMAP, false);
+ }
+ // Draw press ESC to exit string on main record attack menu
+ V_DrawString(104-72, 180, V_TRANSLUCENT, M_GetText("Press ESC to exit"));
+ }
// Super Sonic
M_DrawNightsAttackSuperSonic();
@@ -9469,10 +9489,6 @@ void M_DrawNightsAttackMenu(void)
}
}
- // Draw press ESC to exit string on main nights attack menu
- if (currentMenu == &SP_NightsAttackDef)
- V_DrawString(104-72, 180, V_TRANSLUCENT, M_GetText("Press ESC to exit"));
-
// ALWAYS DRAW level even when not on this menu!
if (currentMenu != &SP_NightsAttackDef)
V_DrawString(SP_NightsAttackDef.x, SP_NightsAttackDef.y + SP_TimeAttackMenu[nalevel].alphaKey, V_TRANSLUCENT, SP_NightsAttackMenu[nalevel].text);
--
GitLab