cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-04 13:54:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bugfix/play-state-fix' into feature/chart-editor-song-preview

Browse source
This commit is contained in:
EliteMasterEric 2023-08-09 17:53:25 -04:00
parent b9c25d6ed9 3e02f7fca9
commit 859b543118
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/play/GameOverSubState.hx
View file

@ -130,11 +130,11 @@ class GameOverSubState extends MusicBeatSubState
if (boyfriend.hasAnimation('fakeoutDeath') && FlxG.random.bool((1 / 4096) * 100)) if (boyfriend.hasAnimation('fakeoutDeath') && FlxG.random.bool((1 / 4096) * 100))
{ {
boyfriend.playAnimation('fakeoutDeath', true, true); boyfriend.playAnimation('fakeoutDeath', true, false);
} }
else else
{ {
boyfriend.playAnimation('firstDeath', true, true); boyfriend.playAnimation('firstDeath', true, false); // ignoreOther is set to FALSE since you WANT to be able to mash and confirm game over!
// Play the "blue balled" sound. May play a variant if one has been assigned. // Play the "blue balled" sound. May play a variant if one has been assigned.
playBlueBalledSFX(); playBlueBalledSFX();
} }

11
source/funkin/play/PlayState.hx
View file

@ -321,6 +321,11 @@ class PlayState extends MusicBeatSubState
*/ */
var startingSong:Bool = false; var startingSong:Bool = false;
/**
* False until `create()` has completed.
*/
var initialized:Bool = false;
/** /**
* A group of audio tracks, used to play the song's vocals. * A group of audio tracks, used to play the song's vocals.
*/ */
@ -651,6 +656,8 @@ class PlayState extends MusicBeatSubState
FlxG.console.registerObject('playState', this); FlxG.console.registerObject('playState', this);
#end #end
initialized = true;
} }
public override function update(elapsed:Float):Void public override function update(elapsed:Float):Void
@ -1107,7 +1114,7 @@ class PlayState extends MusicBeatSubState
override function stepHit():Bool override function stepHit():Bool
{ {
if (criticalFailure) return false; if (criticalFailure || !initialized) return false;
// super.stepHit() returns false if a module cancelled the event. // super.stepHit() returns false if a module cancelled the event.
if (!super.stepHit()) return false; if (!super.stepHit()) return false;
@ -1133,7 +1140,7 @@ class PlayState extends MusicBeatSubState
override function beatHit():Bool override function beatHit():Bool
{ {
if (criticalFailure) return false; if (criticalFailure || !initialized) return false;
// super.beatHit() returns false if a module cancelled the event. // super.beatHit() returns false if a module cancelled the event.
if (!super.beatHit()) return false; if (!super.beatHit()) return false;