gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert camCutscene rename

Browse Source
This commit is contained in:
gamerbross
2024-06-12 00:34:04 +02:00
committed by GitHub
parent 0a6f1abd33
commit b7eaa238e0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/play/PlayState.hx
+8 -8
View File
@@ -493,7 +493,7 @@ class PlayState extends MusicBeatSubState
/**
* 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.
@@ -960,7 +960,7 @@ class PlayState extends MusicBeatSubState
FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camOther;
pauseSubState.camera = camCutscene;
openSubState(pauseSubState);
// boyfriendPos.put(); // TODO: Why is this here?
}
@@ -1501,12 +1501,12 @@ class PlayState extends MusicBeatSubState
camGame.bgColor = BACKGROUND_COLOR; // Show a pink background behind the stage.
camHUD = new FlxCamera();
camHUD.bgColor.alpha = 0; // Show the game scene behind the camera.
camOther = new FlxCamera();
camOther.bgColor.alpha = 0; // Show the game scene behind the camera.
camCutscene = new FlxCamera();
camCutscene.bgColor.alpha = 0; // Show the game scene behind the camera.
FlxG.cameras.reset(camGame);
FlxG.cameras.add(camHUD, false);
FlxG.cameras.add(camOther, false);
FlxG.cameras.add(camCutscene, false);
// Configure camera follow point.
if (previousCameraFollowPoint != null)
@@ -1918,7 +1918,7 @@ class PlayState extends MusicBeatSubState
if (!currentConversation.alive) currentConversation.revive();
currentConversation.completeCallback = onConversationComplete;
currentConversation.cameras = [camOther];
currentConversation.cameras = [camCutscene];
currentConversation.zIndex = 1000;
add(currentConversation);
refresh();
@@ -2750,7 +2750,7 @@ class PlayState extends MusicBeatSubState
persistentUpdate = false;
FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camOther;
pauseSubState.camera = camCutscene;
openSubState(pauseSubState);
}
}
@@ -2766,7 +2766,7 @@ class PlayState extends MusicBeatSubState
persistentUpdate = false;
FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true;
pauseSubState.camera = camOther;
pauseSubState.camera = camCutscene;
openSubState(pauseSubState);
}
}
source/funkin/play/cutscene/VideoCutscene.hx
+3 -3
View File
@@ -85,7 +85,7 @@ class VideoCutscene
// 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.scrollFactor.set(0, 0);
blackScreen.cameras = [PlayState.instance.camOther];
blackScreen.cameras = [PlayState.instance.camCutscene];
PlayState.instance.add(blackScreen);
VideoCutscene.cutsceneType = cutsceneType;
@@ -119,7 +119,7 @@ class VideoCutscene
vid.finishCallback = finishVideo.bind(0.5);
vid.cameras = [PlayState.instance.camOther];
vid.cameras = [PlayState.instance.camCutscene];
PlayState.instance.add(vid);
@@ -146,7 +146,7 @@ class VideoCutscene
vid.bitmap.onEndReached.add(finishVideo.bind(0.5));
vid.autoPause = false;
vid.cameras = [PlayState.instance.camOther];
vid.cameras = [PlayState.instance.camCutscene];
PlayState.instance.add(vid);