mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-12-23 21:56:46 +00:00
Merge pull request #712 from FunkinCrew/menu-music-fix
FUNK-525 stop main menu music from playing when entering freeplay from pausemenu
This commit is contained in:
commit
78fb6e1188
|
@ -317,15 +317,6 @@ class FreeplayState extends MusicBeatSubState
|
|||
isDebug = true;
|
||||
#end
|
||||
|
||||
if (prepForNewRank == false)
|
||||
{
|
||||
FunkinSound.playMusic('freakyMenu',
|
||||
{
|
||||
overrideExisting: true,
|
||||
restartTrack: false
|
||||
});
|
||||
}
|
||||
|
||||
// Add a null entry that represents the RANDOM option
|
||||
songs.push(null);
|
||||
|
||||
|
@ -2031,10 +2022,7 @@ class FreeplayState extends MusicBeatSubState
|
|||
public static function build(?params:FreeplayStateParams, ?stickers:StickerSubState):MusicBeatState
|
||||
{
|
||||
var result:MainMenuState;
|
||||
if (params?.fromResults?.playRankAnim ?? false) result = new MainMenuState(true);
|
||||
else
|
||||
result = new MainMenuState(false);
|
||||
|
||||
result = new MainMenuState(true);
|
||||
result.openSubState(new FreeplayState(params, stickers));
|
||||
result.persistentUpdate = false;
|
||||
result.persistentDraw = true;
|
||||
|
|
|
@ -64,7 +64,7 @@ class MainMenuState extends MusicBeatState
|
|||
transIn = FlxTransitionableState.defaultTransIn;
|
||||
transOut = FlxTransitionableState.defaultTransOut;
|
||||
|
||||
if (overrideMusic == false) playMenuMusic();
|
||||
if (!overrideMusic) playMenuMusic();
|
||||
|
||||
// We want the state to always be able to begin with being able to accept inputs and show the anims of the menu items.
|
||||
persistentUpdate = true;
|
||||
|
|
Loading…
Reference in a new issue