Skip to content

Commit 34639d7

Browse files
committed
Fix ScriptedCutscene Confusing Event Names
1 parent abf77f7 commit 34639d7

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

source/funkin/game/cutscenes/ScriptedCutscene.hx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,20 @@ class ScriptedCutscene extends Cutscene {
9595
script.call("stepHit", [curStep]);
9696
}
9797

98-
public override function openSubState(sub:FlxSubState)
98+
public override function openSubState(subState:FlxSubState)
9999
{
100-
var event = EventManager.get(StateEvent).recycle(sub);
101-
script.call("onSubstateClose", [event]);
102-
if(!event.cancelled) super.openSubState(event.substate is FlxSubState ? cast event.substate : sub);
100+
var event = EventManager.get(StateEvent).recycle(subState);
101+
script.call(Flags.MOD_API_VERSION > 2 ? "onSubstateClose" /*Remove this entirely*/ : "onOpenSubState", [event]);
102+
if (!event.cancelled)
103+
super.openSubState(event.substate is FlxSubState ? event.substate : subState);
103104
}
104105

105106
public override function closeSubState()
106107
{
107108
var event = EventManager.get(StateEvent).recycle(subState);
108-
script.call("onSubstateOpen", [event]);
109-
if(!event.cancelled) super.closeSubState();
109+
script.call(Flags.MOD_API_VERSION > 2 ? "onSubstateOpen" /*Remove this entirely*/ : "onCloseSubState", [event]);
110+
if (!event.cancelled)
111+
super.closeSubState();
110112
}
111113

112114
public override function destroy() {

0 commit comments

Comments
 (0)