diff --git a/buildnumber.txt b/buildnumber.txt index e9ad4b45..3c719f27 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2094 \ No newline at end of file +2096 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index fce69b62..9bcea61b 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -445,6 +445,8 @@ class PlayState extends MusicBeatState */ public var hitWindow:Float = Options.hitWindow; // is calculated in create(), is safeFrames in milliseconds + @:noCompletion @:dox(hide) private var _startCountdownCalled:Bool = false; + @:dox(hide) var __vocalOffsetViolation:Float = 0; @@ -746,14 +748,16 @@ class PlayState extends MusicBeatState public function startCountdown():Void { + if (!_startCountdownCalled) { + _startCountdownCalled = true; + inCutscene = false; - inCutscene = false; + var e = scripts.event("onStartCountdown", new CancellableEvent()); + if (e.cancelled) return; + } generateStrums(); - var e = scripts.event("onStartCountdown", new CancellableEvent()); - if (e.cancelled) return; - startedCountdown = true; Conductor.songPosition = 0; Conductor.songPosition -= Conductor.crochet * introLength;