cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #712 from FunkinCrew/menu-music-fix

Browse source 
FUNK-525 stop main menu music from playing when entering freeplay from pausemenu
This commit is contained in:
Cameron Taylor 2024-08-29 18:28:00 -04:00 committed by GitHub
parent ecd6100cf9 0a316c815f
commit 78fb6e1188
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -317,15 +317,6 @@ class FreeplayState extends MusicBeatSubState
isDebug = true; isDebug = true;
#end #end
if (prepForNewRank == false)
{
FunkinSound.playMusic('freakyMenu',
{
overrideExisting: true,
restartTrack: false
});
}
// Add a null entry that represents the RANDOM option // Add a null entry that represents the RANDOM option
songs.push(null); songs.push(null);
@ -2031,10 +2022,7 @@ class FreeplayState extends MusicBeatSubState
public static function build(?params:FreeplayStateParams, ?stickers:StickerSubState):MusicBeatState public static function build(?params:FreeplayStateParams, ?stickers:StickerSubState):MusicBeatState
{ {
var result:MainMenuState; var result:MainMenuState;
if (params?.fromResults?.playRankAnim ?? false) result = new MainMenuState(true); result = new MainMenuState(true);
else
result = new MainMenuState(false);
result.openSubState(new FreeplayState(params, stickers)); result.openSubState(new FreeplayState(params, stickers));
result.persistentUpdate = false; result.persistentUpdate = false;
result.persistentDraw = true; result.persistentDraw = true;

2
source/funkin/ui/mainmenu/MainMenuState.hx
View file

@ -64,7 +64,7 @@ class MainMenuState extends MusicBeatState
transIn = FlxTransitionableState.defaultTransIn; transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut; 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. // 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; persistentUpdate = true;