From 59cdfa8e272a670ad6bd7e11966dec9b89e7ca67 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 18 Aug 2019 17:32:52 -0400
Subject: [PATCH] New music for record attack and nights attack menus
---
src/m_menu.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/m_menu.c b/src/m_menu.c
index 815b7bcbb..63002e44a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2243,8 +2243,10 @@ void M_InitMenuPresTables(void)
{
menupres[i].muslooping = true;
}
- if (i == MN_SP_TIMEATTACK || i == MN_SP_NIGHTSATTACK)
- strncpy(menupres[i].musname, "_inter", 7);
+ if (i == MN_SP_TIMEATTACK)
+ strncpy(menupres[i].musname, "recatk", 7);
+ else if (i == MN_SP_NIGHTSATTACK)
+ strncpy(menupres[i].musname, "nitatk", 7);
else if (i == MN_SP_PLAYER)
strncpy(menupres[i].musname, "_chsel", 7);
}
@@ -8159,7 +8161,7 @@ void M_DrawTimeAttackMenu(void)
curbgxspeed = 0;
curbgyspeed = 18;
- M_ChangeMenuMusic("_inter", true); // Eww, but needed for when user hits escape during demo playback
+ M_ChangeMenuMusic("recatk", true); // Eww, but needed for when user hits escape during demo playback
if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
@@ -8174,7 +8176,7 @@ void M_DrawTimeAttackMenu(void)
fa = (FixedAngle(((recfgtimer * 4) % 360)<<FRACBITS)>>ANGLETOFINESHIFT) & FINEMASK;
V_DrawSciencePatch(0, -(130<<FRACBITS) + FixedMul(130<<FRACBITS, FixedDiv(recfgtimer%70, 70)), V_SNAPTOTOP|V_SNAPTOLEFT, W_CachePatchName("RECATFG", PU_CACHE), FRACUNIT);
V_DrawSciencePatch(320<<FRACBITS, -(130<<FRACBITS) + FixedMul(130<<FRACBITS, FixedDiv(recfgtimer%70, 70)), V_SNAPTOTOP|V_SNAPTORIGHT|V_FLIP, W_CachePatchName("RECATFG", PU_CACHE), FRACUNIT);
- V_DrawSciencePatch(160<<FRACBITS, (80<<FRACBITS) + (4*FINESINE(fa)), 0, W_CachePatchName("RECCLOCK", PU_CACHE), FRACUNIT);
+ V_DrawSciencePatch(120<<FRACBITS, (80<<FRACBITS) + (4*FINESINE(fa)), 0, W_CachePatchName("RECCLOCK", PU_CACHE), FRACUNIT);
recfgtimer++;
}
M_DrawMenuTitle();
@@ -8374,7 +8376,7 @@ void M_DrawNightsAttackMenu(void)
M_SetMenuCurBackground("SRB2BACK");
- M_ChangeMenuMusic("_inter", true); // Eww, but needed for when user hits escape during demo playback
+ M_ChangeMenuMusic("nitatk", true); // Eww, but needed for when user hits escape during demo playback
if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);