fix crash

FunkinCrew · Dec 17, 2020 · cfeaf5c · cfeaf5c
1 parent cd16f98
commit cfeaf5c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 123 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 ### Fixed
+- Crash when playing Week 3 and then playing a non-week 3 song
 - When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
 - IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
 

diff --git a/assets/images/lucky_guitar_assets.png b/assets/images/lucky_guitar_assets.png
diff --git a/assets/images/lucky_guitar_assets.xml b/assets/images/lucky_guitar_assets.xml
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -135,6 +135,7 @@ class PlayState extends MusicBeatState
 
 		if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
 		{
+			curState = "spooky";
 			halloweenLevel = true;
 
 			var hallowTex = FlxAtlasFrames.fromSparrow(AssetPaths.halloween_bg__png, AssetPaths.halloween_bg__xml);
@@ -192,6 +193,7 @@ class PlayState extends MusicBeatState
 		}
 		else
 		{
+			curStage = 'stage';
 			var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.stageback__png);
 			// bg.setGraphicSize(Std.int(bg.width * 2.5));
 			// bg.updateHitbox();
@@ -974,6 +976,7 @@ class PlayState extends MusicBeatState
 				trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);
 
 				PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]);
+				FlxG.sound.music.stop();
 				FlxG.switchState(new PlayState());
 			}
 		}