From ca0355046330d88519f1808425d97954b677d929 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Wed, 14 Dec 2022 14:20:59 +0100 Subject: [PATCH] video cutscenes define --- Project.xml | 3 +++ source/funkin/cutscenes/MP4Handler.hx | 2 +- source/funkin/cutscenes/VideoCutscene.hx | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Project.xml b/Project.xml index 564752e5..3d983c5b 100644 --- a/Project.xml +++ b/Project.xml @@ -190,4 +190,7 @@ + + + diff --git a/source/funkin/cutscenes/MP4Handler.hx b/source/funkin/cutscenes/MP4Handler.hx index 185f297a..3f976143 100644 --- a/source/funkin/cutscenes/MP4Handler.hx +++ b/source/funkin/cutscenes/MP4Handler.hx @@ -1,6 +1,6 @@ package funkin.cutscenes; -#if sys +#if VIDEO_CUTSCENES import vlc.bitmap.VlcBitmap; import flixel.util.FlxTimer; import funkin.options.PlayerSettings; diff --git a/source/funkin/cutscenes/VideoCutscene.hx b/source/funkin/cutscenes/VideoCutscene.hx index aabebb2a..ccb54eb5 100644 --- a/source/funkin/cutscenes/VideoCutscene.hx +++ b/source/funkin/cutscenes/VideoCutscene.hx @@ -9,7 +9,7 @@ class VideoCutscene extends Cutscene { var path:String; var localPath:String; - #if sys + #if VIDEO_CUTSCENES var video:MP4Handler; var videoSprite:FlxSprite; #end @@ -27,7 +27,7 @@ class VideoCutscene extends Cutscene { cutsceneCamera.bgColor = 0; FlxG.cameras.add(cutsceneCamera, false); - #if sys + #if VIDEO_CUTSCENES video = new MP4Handler(); video.finishCallback = close; video.canvasWidth = cutsceneCamera.width; @@ -46,12 +46,12 @@ class VideoCutscene extends Cutscene { public override function update(elapsed:Float) { super.update(elapsed); - #if !sys + #if !VIDEO_CUTSCENES close(); #end } public override function destroy() { - FlxG.cameras.remove(camera, true); + FlxG.cameras.remove(cutsceneCamera, true); super.destroy(); } } \ No newline at end of file