cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-28 13:09:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2518 from gamerbross/bugfix/gameover-charting-crash

Browse source 
[BUGFIX] ChartingState GameOver Crashes
This commit is contained in:
Eric 2024-05-18 14:17:29 -04:00 committed by GitHub
parent 0a4cbf4ef8 f1a0692c51
commit 6744c1d261
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,8 @@ class GameOverSubState extends MusicBeatSubState
@:nullSafety(Off)
function setCameraTarget():Void
{
if (PlayState.instance.isMinimalMode || boyfriend == null) return;
// Assign a camera follow point to the boyfriend's position.
cameraFollowPoint = new FlxObject(PlayState.instance.cameraFollowPoint.x, PlayState.instance.cameraFollowPoint.y, 1, 1);
cameraFollowPoint.x = boyfriend.getGraphicMidpoint().x;
@ -254,6 +256,7 @@ class GameOverSubState extends MusicBeatSubState
this.close();
if (FlxG.sound.music != null) FlxG.sound.music.pause(); // Don't reset song position!
PlayState.instance.close(); // This only works because PlayState is a substate!
return;
}
else if (PlayStatePlaylist.isStoryMode)
{

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

@ -1092,8 +1092,11 @@ class PlayState extends MusicBeatSubState
healthBar.value = healthLerp;
iconP1.updatePosition();
iconP2.updatePosition();
if (!isMinimalMode)
{
iconP1.updatePosition();
iconP2.updatePosition();
}
// Transition to the game over substate.
var gameOverSubState = new GameOverSubState(