lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New music for record attack and nights attack menus

Browse source
This commit is contained in:
Steel Titanium 2019-08-18 17:32:52 -04:00
parent fe11620b60
commit 59cdfa8e27
No known key found for this signature in database
GPG key ID: 924BA411F18DFDBE
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/m_menu.c
View file

@ -2243,8 +2243,10 @@ void M_InitMenuPresTables(void)
{ {
menupres[i].muslooping = true; menupres[i].muslooping = true;
} }
if (i == MN_SP_TIMEATTACK || i == MN_SP_NIGHTSATTACK) if (i == MN_SP_TIMEATTACK)
strncpy(menupres[i].musname, "_inter", 7); strncpy(menupres[i].musname, "recatk", 7);
else if (i == MN_SP_NIGHTSATTACK)
strncpy(menupres[i].musname, "nitatk", 7);
else if (i == MN_SP_PLAYER) else if (i == MN_SP_PLAYER)
strncpy(menupres[i].musname, "_chsel", 7); strncpy(menupres[i].musname, "_chsel", 7);
} }
@ -8159,7 +8161,7 @@ void M_DrawTimeAttackMenu(void)
curbgxspeed = 0; curbgxspeed = 0;
curbgyspeed = 18; 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) if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
@ -8174,7 +8176,7 @@ void M_DrawTimeAttackMenu(void)
fa = (FixedAngle(((recfgtimer * 4) % 360)<<FRACBITS)>>ANGLETOFINESHIFT) & FINEMASK; 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(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(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++; recfgtimer++;
} }
M_DrawMenuTitle(); M_DrawMenuTitle();
@ -8374,7 +8376,7 @@ void M_DrawNightsAttackMenu(void)
M_SetMenuCurBackground("SRB2BACK"); 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) if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);