mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-15 11:22:55 +00:00
Merge branch 'lemz1/substate-event-dispatch' into rewrite/master
This commit is contained in:
commit
ccb2e1889f
|
@ -37,17 +37,25 @@ class MusicBeatSubState extends FlxSubState implements IEventHandler
|
||||||
return _conductorInUse = value;
|
return _conductorInUse = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function new(bgColor:FlxColor = FlxColor.TRANSPARENT)
|
|
||||||
{
|
|
||||||
super();
|
|
||||||
this.bgColor = bgColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
var controls(get, never):Controls;
|
var controls(get, never):Controls;
|
||||||
|
|
||||||
inline function get_controls():Controls
|
inline function get_controls():Controls
|
||||||
return PlayerSettings.player1.controls;
|
return PlayerSettings.player1.controls;
|
||||||
|
|
||||||
|
public function new(bgColor:FlxColor = FlxColor.TRANSPARENT)
|
||||||
|
{
|
||||||
|
super();
|
||||||
|
this.bgColor = bgColor;
|
||||||
|
|
||||||
|
initCallbacks();
|
||||||
|
}
|
||||||
|
|
||||||
|
function initCallbacks()
|
||||||
|
{
|
||||||
|
subStateOpened.add(onOpenSubStateComplete);
|
||||||
|
subStateClosed.add(onCloseSubStateComplete);
|
||||||
|
}
|
||||||
|
|
||||||
override function create():Void
|
override function create():Void
|
||||||
{
|
{
|
||||||
super.create();
|
super.create();
|
||||||
|
|
Loading…
Reference in a new issue