cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-03 10:38:42 +00:00
Code Issues Releases Wiki Activity

Revert camCutscene rename

Browse source
This commit is contained in:
gamerbross 2024-06-12 00:34:04 +02:00 committed by EliteMasterEric
parent e23e6c160d
commit e6c9767800
2 changed files with 11 additions and 11 deletions
source/funkin/play
PlayState.hx
cutscene
VideoCutscene.hx

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

@ -505,7 +505,7 @@ class PlayState extends MusicBeatSubState
/** /**
* The camera which contains, and controls visibility of, a video cutscene, dialogue, pause menu and sticker transition. * The camera which contains, and controls visibility of, a video cutscene, dialogue, pause menu and sticker transition.
*/ */
public var camOther:FlxCamera; public var camCutscene:FlxCamera;
/** /**
* The combo popups. Includes the real-time combo counter and the rating. * The combo popups. Includes the real-time combo counter and the rating.
@ -975,7 +975,7 @@ class PlayState extends MusicBeatSubState
FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camOther; pauseSubState.camera = camCutscene;
openSubState(pauseSubState); openSubState(pauseSubState);
// boyfriendPos.put(); // TODO: Why is this here? // boyfriendPos.put(); // TODO: Why is this here?
} }
@ -1543,12 +1543,12 @@ class PlayState extends MusicBeatSubState
camGame.bgColor = BACKGROUND_COLOR; // Show a pink background behind the stage. camGame.bgColor = BACKGROUND_COLOR; // Show a pink background behind the stage.
camHUD = new FlxCamera(); camHUD = new FlxCamera();
camHUD.bgColor.alpha = 0; // Show the game scene behind the camera. camHUD.bgColor.alpha = 0; // Show the game scene behind the camera.
camOther = new FlxCamera(); camCutscene = new FlxCamera();
camOther.bgColor.alpha = 0; // Show the game scene behind the camera. camCutscene.bgColor.alpha = 0; // Show the game scene behind the camera.
FlxG.cameras.reset(camGame); FlxG.cameras.reset(camGame);
FlxG.cameras.add(camHUD, false); FlxG.cameras.add(camHUD, false);
FlxG.cameras.add(camOther, false); FlxG.cameras.add(camCutscene, false);
// Configure camera follow point. // Configure camera follow point.
if (previousCameraFollowPoint != null) if (previousCameraFollowPoint != null)
@ -1952,7 +1952,7 @@ class PlayState extends MusicBeatSubState
if (!currentConversation.alive) currentConversation.revive(); if (!currentConversation.alive) currentConversation.revive();
currentConversation.completeCallback = onConversationComplete; currentConversation.completeCallback = onConversationComplete;
currentConversation.cameras = [camOther]; currentConversation.cameras = [camCutscene];
currentConversation.zIndex = 1000; currentConversation.zIndex = 1000;
add(currentConversation); add(currentConversation);
refresh(); refresh();
@ -2787,7 +2787,7 @@ class PlayState extends MusicBeatSubState
persistentUpdate = false; persistentUpdate = false;
FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camOther; pauseSubState.camera = camCutscene;
openSubState(pauseSubState); openSubState(pauseSubState);
} }
} }
@ -2803,7 +2803,7 @@ class PlayState extends MusicBeatSubState
persistentUpdate = false; persistentUpdate = false;
FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camOther; pauseSubState.camera = camCutscene;
openSubState(pauseSubState); openSubState(pauseSubState);
} }
} }

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

@ -85,7 +85,7 @@ class VideoCutscene
// 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);
blackScreen.scrollFactor.set(0, 0); blackScreen.scrollFactor.set(0, 0);
blackScreen.cameras = [PlayState.instance.camOther]; blackScreen.cameras = [PlayState.instance.camCutscene];
PlayState.instance.add(blackScreen); PlayState.instance.add(blackScreen);
VideoCutscene.cutsceneType = cutsceneType; VideoCutscene.cutsceneType = cutsceneType;
@ -119,7 +119,7 @@ class VideoCutscene
vid.finishCallback = finishVideo.bind(0.5); vid.finishCallback = finishVideo.bind(0.5);
vid.cameras = [PlayState.instance.camOther]; vid.cameras = [PlayState.instance.camCutscene];
PlayState.instance.add(vid); PlayState.instance.add(vid);
@ -146,7 +146,7 @@ class VideoCutscene
vid.bitmap.onEndReached.add(finishVideo.bind(0.5)); vid.bitmap.onEndReached.add(finishVideo.bind(0.5));
vid.autoPause = FlxG.autoPause; vid.autoPause = FlxG.autoPause;
vid.cameras = [PlayState.instance.camOther]; vid.cameras = [PlayState.instance.camCutscene];
PlayState.instance.add(vid); PlayState.instance.add(vid);