some cutscene stuff
This commit is contained in:
@@ -1046,10 +1046,6 @@ class PlayState extends MusicBeatState
|
|||||||
Note.__customNoteTypeExists = [];
|
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")
|
@:dox(hide) @:deprecated("scrollSpeedTween is deprecated, use eventsTween['scrollSpeed'] instead")
|
||||||
public var scrollSpeedTween(get, set):FlxTween;
|
public var scrollSpeedTween(get, set):FlxTween;
|
||||||
private inline function get_scrollSpeedTween() return eventsTween.get("scrollSpeed");
|
private inline function get_scrollSpeedTween() return eventsTween.get("scrollSpeed");
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ import funkin.menus.PauseSubState;
|
|||||||
*/
|
*/
|
||||||
class Cutscene extends MusicBeatSubstate {
|
class Cutscene extends MusicBeatSubstate {
|
||||||
var __callback:Void->Void;
|
var __callback:Void->Void;
|
||||||
var __pausable:Bool;
|
|
||||||
var game:PlayState = PlayState.instance;
|
var game:PlayState = PlayState.instance;
|
||||||
|
|
||||||
public var paused:Bool = false;
|
public var paused:Bool = false;
|
||||||
public var pauseItems:Array<String>;
|
public var pauseItems:Array<String>;
|
||||||
|
public var pausable:Bool;
|
||||||
public var skippable(default, set):Bool;
|
public var skippable(default, set):Bool;
|
||||||
|
|
||||||
public function set_skippable(val:Bool):Bool {
|
public function set_skippable(val:Bool):Bool {
|
||||||
@@ -26,9 +26,9 @@ class Cutscene extends MusicBeatSubstate {
|
|||||||
canOpenCustomTransition = true;
|
canOpenCustomTransition = true;
|
||||||
|
|
||||||
__callback = callback;
|
__callback = callback;
|
||||||
__pausable = allowPause;
|
|
||||||
|
|
||||||
pauseItems = Flags.DEFAULT_CUTSCENE_PAUSE_ITEMS;
|
pauseItems = Flags.DEFAULT_CUTSCENE_PAUSE_ITEMS;
|
||||||
|
pausable = allowPause;
|
||||||
skippable = canSkip;
|
skippable = canSkip;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@ class Cutscene extends MusicBeatSubstate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function pauseCheck():Bool
|
public function pauseCheck():Bool
|
||||||
return controls.PAUSE && __pausable;
|
return controls.PAUSE && pausable;
|
||||||
|
|
||||||
var _before:Array<Bool> = [false, true];
|
var _before:Array<Bool> = [false, true];
|
||||||
public function pauseCutscene() {
|
public function pauseCutscene() {
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ class VideoCutscene extends Cutscene {
|
|||||||
text.destroy();
|
text.destroy();
|
||||||
}});
|
}});
|
||||||
|
|
||||||
__pausable = __loaded = true;
|
pausable = __loaded = true;
|
||||||
video.play();
|
video.play();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user