From 174b218200a94fedfe9a246626b28c54d883e9cc Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:42:04 +0300 Subject: [PATCH] fix duplicate calls between playstate and musicbeatstate (#190) * replace single scripts with scriptpack * this might break a ton of mods i think * oops * stuff * oops 2 * d * guh --------- Co-authored-by: Frakist <90983918+Frakist@users.noreply.github.com> --- source/funkin/game/PlayState.hx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 285e8a52..c04a4a8b 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1007,7 +1007,6 @@ class PlayState extends MusicBeatState inst.resume(); vocals.resume(); } - scripts.call("onFocus"); updateDiscordPresence(); super.onFocus(); } @@ -1019,7 +1018,6 @@ class PlayState extends MusicBeatState inst.pause(); vocals.pause(); } - scripts.call("onFocusLost"); updateDiscordPresence(); super.onFocusLost(); } @@ -1573,23 +1571,15 @@ class PlayState extends MusicBeatState @:dox(hide) override function stepHit(curStep:Int) - { super.stepHit(curStep); - scripts.call("stepHit", [curStep]); - } @:dox(hide) override function measureHit(curMeasure:Int) - { super.measureHit(curMeasure); - scripts.call("measureHit", [curMeasure]); - } @:dox(hide) override function beatHit(curBeat:Int) { - super.beatHit(curBeat); - if (camZoomingInterval < 1) camZoomingInterval = 1; if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && curBeat % camZoomingInterval == 0) { @@ -1603,7 +1593,7 @@ class PlayState extends MusicBeatState iconP1.updateHitbox(); iconP2.updateHitbox(); - scripts.call("beatHit", [curBeat]); + super.beatHit(curBeat); } // GETTERS & SETTERS