gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "fix duplicate calls between playstate and musicbeatstate (#190)" (#192)

Browse Source 
This reverts commit 174b218200.
This commit is contained in:
lunarcleint
2023-07-19 20:52:50 -07:00
committed by GitHub
parent 23648695e9
commit d359e5aa49
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/game/PlayState.hx
+11 -1
View File
@@ -1015,6 +1015,7 @@ class PlayState extends MusicBeatState
inst.resume();
vocals.resume();
}
scripts.call("onFocus");
updateDiscordPresence();
super.onFocus();
}
@@ -1026,6 +1027,7 @@ class PlayState extends MusicBeatState
inst.pause();
vocals.pause();
}
scripts.call("onFocusLost");
updateDiscordPresence();
super.onFocusLost();
}
@@ -1579,15 +1581,23 @@ 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)
{
@@ -1601,7 +1611,7 @@ class PlayState extends MusicBeatState
iconP1.updateHitbox();
iconP2.updateHitbox();
super.beatHit(curBeat);
scripts.call("beatHit", [curBeat]);
}
// GETTERS & SETTERS