diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 699ccb52..90ea76a4 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1046,10 +1046,6 @@ class PlayState extends MusicBeatState Note.__customNoteTypeExists = []; } - // Backwards compat - @:dox(hide) @:deprecated("resetSongInfos is deprecated, it's now handled in the loading song/weeks functions") - public static function resetSongInfos() {} - @:dox(hide) @:deprecated("scrollSpeedTween is deprecated, use eventsTween['scrollSpeed'] instead") public var scrollSpeedTween(get, set):FlxTween; private inline function get_scrollSpeedTween() return eventsTween.get("scrollSpeed"); diff --git a/source/funkin/game/cutscenes/Cutscene.hx b/source/funkin/game/cutscenes/Cutscene.hx index 9845e916..51e6ed1f 100644 --- a/source/funkin/game/cutscenes/Cutscene.hx +++ b/source/funkin/game/cutscenes/Cutscene.hx @@ -8,11 +8,11 @@ import funkin.menus.PauseSubState; */ class Cutscene extends MusicBeatSubstate { var __callback:Void->Void; - var __pausable:Bool; var game:PlayState = PlayState.instance; public var paused:Bool = false; public var pauseItems:Array; + public var pausable:Bool; public var skippable(default, set):Bool; public function set_skippable(val:Bool):Bool { @@ -26,9 +26,9 @@ class Cutscene extends MusicBeatSubstate { canOpenCustomTransition = true; __callback = callback; - __pausable = allowPause; pauseItems = Flags.DEFAULT_CUTSCENE_PAUSE_ITEMS; + pausable = allowPause; skippable = canSkip; } @@ -38,7 +38,7 @@ class Cutscene extends MusicBeatSubstate { } public function pauseCheck():Bool - return controls.PAUSE && __pausable; + return controls.PAUSE && pausable; var _before:Array = [false, true]; public function pauseCutscene() { diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx index 9e5a50bd..f3e3e274 100644 --- a/source/funkin/game/cutscenes/VideoCutscene.hx +++ b/source/funkin/game/cutscenes/VideoCutscene.hx @@ -186,7 +186,7 @@ class VideoCutscene extends Cutscene { text.destroy(); }}); - __pausable = __loaded = true; + pausable = __loaded = true; video.play(); }