fullscreen/FullScreenPokemon
0
0
Fork 0
mirror of https://github.com/FullScreenShenanigans/FullScreenPokemon.git synced 2026-04-28 12:58:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix (and added hooks) for disabling pause menu

Browse Source 
Fixes bug where start menu may open during intro cutscene.
This commit is contained in:
Josh Goldberg
2015-10-07 16:40:32 -07:00
parent e777266530
commit eaaa31ceaf
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/FullScreenPokemon.ts
+13 -5
View File
@@ -384,7 +384,9 @@ module FullScreenPokemon {
*/
gameStartIntro(FSP: FullScreenPokemon): void {
FSP.ItemsHolder.clear();
FSP.ScenePlayer.startCutscene("Intro");
FSP.ScenePlayer.startCutscene("Intro", {
"disablePauseMenu": true
});
FSP.ModAttacher.fireEvent("onGameStartIntro");
}
@@ -3214,11 +3216,17 @@ module FullScreenPokemon {
togglePauseMenu(thing: IThing): void {
if (thing.FSP.MenuGrapher.getActiveMenu()) {
thing.FSP.MenuGrapher.registerStart();
} else if (thing.FSP.MenuGrapher.getActiveMenu()) {
thing.FSP.closePauseMenu();
} else {
thing.FSP.openPauseMenu();
return;
}
var cutsceneSettings: any = thing.FSP.ScenePlayer.getCutsceneSettings();
if (cutsceneSettings && cutsceneSettings.disablePauseMenu) {
return;
}
thing.FSP.MenuGrapher.getMenu("Pause")
? thing.FSP.closePauseMenu()
: thing.FSP.openPauseMenu();
}
/**