cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-07-04 17:56:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #669 from FunkinCrew/gamerbross/pause-sticker-zoom

Browse source 
[PUBLIC PR] Fix a bug where pausing during a camera zoom would break the HUD funk-612
This commit is contained in:
Cameron Taylor 2024-07-18 15:00:09 -04:00 committed by GitHub
parent e26a99d128 b6a8b62950
commit 8d9071d4fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/funkin/play/PlayState.hx
View file

@ -503,7 +503,7 @@ class PlayState extends MusicBeatSubState
public var camGame:FlxCamera; public var camGame:FlxCamera;
/** /**
* The camera which contains, and controls visibility of, a video cutscene. * The camera which contains, and controls visibility of, a video cutscene, dialogue, pause menu and sticker transition.
*/ */
public var camCutscene:FlxCamera; public var camCutscene:FlxCamera;
@ -975,7 +975,7 @@ class PlayState extends MusicBeatSubState
FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camHUD; pauseSubState.camera = camCutscene;
openSubState(pauseSubState); openSubState(pauseSubState);
// boyfriendPos.put(); // TODO: Why is this here? // boyfriendPos.put(); // TODO: Why is this here?
} }
@ -1934,7 +1934,6 @@ class PlayState extends MusicBeatSubState
if (!result) return; if (!result) return;
isInCutscene = false; isInCutscene = false;
camCutscene.visible = false;
// TODO: Maybe tween in the camera after any cutscenes. // TODO: Maybe tween in the camera after any cutscenes.
camHUD.visible = true; camHUD.visible = true;

2
source/funkin/play/cutscene/VideoCutscene.hx
View file

@ -81,7 +81,6 @@ class VideoCutscene
// Trigger the cutscene. Don't play the song in the background. // Trigger the cutscene. Don't play the song in the background.
PlayState.instance.isInCutscene = true; PlayState.instance.isInCutscene = true;
PlayState.instance.camHUD.visible = false; PlayState.instance.camHUD.visible = false;
PlayState.instance.camCutscene.visible = true;
// Display a black screen to hide the game while the video is playing. // Display a black screen to hide the game while the video is playing.
blackScreen = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK); blackScreen = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
@ -305,7 +304,6 @@ class VideoCutscene
vid = null; vid = null;
#end #end
PlayState.instance.camCutscene.visible = true;
PlayState.instance.camHUD.visible = true; PlayState.instance.camHUD.visible = true;
FlxTween.tween(blackScreen, {alpha: 0}, transitionTime, FlxTween.tween(blackScreen, {alpha: 0}, transitionTime,