Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 16:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix camera issue with stickers

Browse source
This commit is contained in:
EliteMasterEric 2023-06-09 16:54:13 -04:00
parent ba20e5c39c
commit 4dcdca51ae
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/PauseSubState.hx
View file

@ -225,7 +225,7 @@ class PauseSubState extends MusicBeatSubState
if (PlayStatePlaylist.isStoryMode) openSubState(new funkin.ui.StickerSubState(null, STORY)); if (PlayStatePlaylist.isStoryMode) openSubState(new funkin.ui.StickerSubState(null, STORY));
else else
openSubState(new funkin.ui.StickerSubState()); openSubState(new funkin.ui.StickerSubState(null, FREEPLAY));
} }
} }

8
source/funkin/ui/StickerSubState.hx
View file

@ -36,7 +36,8 @@ class StickerSubState extends MusicBeatSubState
add(grpStickers); add(grpStickers);
// makes the stickers on the most recent camera, which is more often than not... a UI camera!! // makes the stickers on the most recent camera, which is more often than not... a UI camera!!
grpStickers.cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]]; // grpStickers.cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
grpStickers.cameras = FlxG.cameras.list;
if (oldStickers != null) if (oldStickers != null)
{ {
@ -208,8 +209,10 @@ class StickerSubState extends MusicBeatSubState
FlxG.switchState(new FreeplayState(this)); FlxG.switchState(new FreeplayState(this));
case STORY: case STORY:
FlxG.switchState(new StoryMenuState(this)); FlxG.switchState(new StoryMenuState(this));
case MAIN_MENU:
FlxG.switchState(new MainMenuState());
default: default:
FlxG.switchState(new FreeplayState(this)); FlxG.switchState(new MainMenuState());
} }
} }
@ -354,6 +357,7 @@ typedef StickerShit =
enum abstract NEXTSTATE(String) enum abstract NEXTSTATE(String)
{ {
var MAIN_MENU = 'mainmenu';
var FREEPLAY = 'freeplay'; var FREEPLAY = 'freeplay';
var STORY = 'story'; var STORY = 'story';
} }