cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-08 05:07:10 +00:00
Code Issues Releases Wiki Activity

Fix issue where main menu music wouldn't play after credits.

Browse source
This commit is contained in:
EliteMasterEric 2024-03-28 02:57:51 -04:00
parent 5311b043ac
commit 3a86b47292
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,10 +51,7 @@ class MainMenuState extends MusicBeatState
transIn = FlxTransitionableState.defaultTransIn; transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut; transOut = FlxTransitionableState.defaultTransOut;
if (!(FlxG?.sound?.music?.playing ?? false)) playMenuMusic();
{
playMenuMusic();
}
persistentUpdate = persistentDraw = true; persistentUpdate = persistentDraw = true;
@ -109,15 +106,18 @@ class MainMenuState extends MusicBeatState
}); });
#if CAN_OPEN_LINKS #if CAN_OPEN_LINKS
// In order to prevent popup blockers from triggering,
// we need to open the link as an immediate result of a keypress event,
// so we can't wait for the flicker animation to complete.
var hasPopupBlocker = #if web true #else false #end; var hasPopupBlocker = #if web true #else false #end;
createMenuItem('donate', 'mainmenu/donate', selectDonate, hasPopupBlocker); createMenuItem('merch', 'mainmenu/merch', selectMerch, hasPopupBlocker);
#end #end
createMenuItem('options', 'mainmenu/options', function() { createMenuItem('options', 'mainmenu/options', function() {
startExitState(() -> new funkin.ui.options.OptionsState()); startExitState(() -> new funkin.ui.options.OptionsState());
}); });
createMenuItem('options', 'mainmenu/options', function() { createMenuItem('credits', 'mainmenu/credits', function() {
startExitState(() -> new funkin.ui.credits.CreditsState()); startExitState(() -> new funkin.ui.credits.CreditsState());
}); });
@ -219,6 +219,11 @@ class MainMenuState extends MusicBeatState
{ {
WindowUtil.openURL(Constants.URL_ITCH); WindowUtil.openURL(Constants.URL_ITCH);
} }
function selectMerch()
{
WindowUtil.openURL(Constants.URL_MERCH);
}
#end #end
#if newgrounds #if newgrounds