oof

VMan-2002 · Nov 14, 2023 · 5585ab2 · 5585ab2
1 parent a01e4b8
commit 5585ab2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
@@ -1357,7 +1357,7 @@ class ChartingState extends MusicBeatState {
 
 			if (daSus > 0) {
 				var sustainVis:FlxSprite = new FlxSprite(note.x + (GRID_SIZE / 2),
-					note.y + GRID_SIZE)..makeGraphic(8, Math.floor(FlxMath.remapToRange(daSus, 0, Conductor.stepCrochet * 16, 0, gridBG.height)));
+					note.y + GRID_SIZE).makeGraphic(8, Math.floor(FlxMath.remapToRange(daSus, 0, Conductor.stepCrochet * 16, 0, gridBG.height)));
 				curRenderedSustains.add(sustainVis);
 			}
 			if ((!hasNormalNote || i[3] != normalNoteNum) && i.length >= 4) {

diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -145,7 +145,7 @@ class MainMenuState extends MusicBeatState {
 
 		// NG.core.calls.event.logEvent('swag').send();
 		if (focusOn != null)
-			curSelected = a.optionShit.indexOf(focusOn);
+			curSelected = optionShit.indexOf(focusOn);
 		changeItem(0, false);
 		FlxG.camera.snapToTarget();
 

diff --git a/source/NoteSplash.hx b/source/NoteSplash.hx
@@ -41,8 +41,10 @@ class NoteSplash extends FlxSprite {
 		else
 			color = noteSplashColorsDefault.get(thing.parent.thisManiaInfo.arrows[daNote.noteData]);
 		animation.play("splash", true);
-		animation.finishCallback = function(name:String)
-			kill();
+		animation.finishCallback = function(name:String) {
+			destroy();
+			this = null;
+		}
 	}
 
 	public var curStyle:String;

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -2347,8 +2347,9 @@ class PlayState extends MusicBeatState {
 			marvelous += 1;
 			//todo: sometimes notesplashes are the wrong color
 			//todo: sometimes notesplashes crash.
-			if (Options.instance.noteSplash)
-				grpNoteSplashes.recycle(NoteSplash, NoteSplash.new).playNoteSplash(playerStrums.strumNotes[daNote.strumNoteNum], daNote);
+			if (Options.instance.noteSplash) {
+				grpNoteSplashes.add(new NoteSplash()).playNoteSplash(playerStrums.strumNotes[daNote.strumNoteNum], daNote);
+			}
 		}
 		if (daRating != "marvelous")
 			songMFC = false;