yeah nah this really needs a rewrite

MaybeMaru · Jul 14, 2024 · 67d3c37 · 67d3c37
1 parent e5f7788
commit 67d3c37
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/source/funkin/states/editors/ChartingState.hx b/source/funkin/states/editors/ChartingState.hx
@@ -432,7 +432,10 @@ class ChartingState extends MusicBeatState
         var note:Array<Dynamic> = [strumTime, noteData, 0, ChartTabs.curType];
         curSectionData.sectionNotes.push(note);
         selectedNote = note;
-        selectedNoteObject = mainGrid.drawObject(note);
+
+        var noteObject = mainGrid.drawObject(note);
+        selectedNoteObject = noteObject;
+        mainGrid.sectionMembers.push(noteObject);
     }
 
     public function selectNote(note:ChartNote) {
@@ -446,14 +449,23 @@ class ChartingState extends MusicBeatState
         }
     }
 
-    public function removeNote(note:ChartNote) {
-        if (note.chartData != null) {
-            if (note.chartData == selectedNote || note == selectedNoteObject) {
-                deselectNote();
-            }
-            curSectionData.sectionNotes.remove(note.chartData);
-            mainGrid.clearObject(note);
+    public function removeNote(note:ChartNote)
+    {
+        var chartData = note.chartData;
+        if (chartData == null)
+            return;
+
+        if (chartData == selectedNote || note == selectedNoteObject)
+            deselectNote();
+
+        // Make sure note gets removed
+        for (i in 0...3) {
+            var section = notes[sectionIndex - 1 + i];
+            if (section != null)
+                section.sectionNotes.remove(chartData);
         }
+
+        mainGrid.clearObject(note);
     }
 
     public var selectedEvents:Array<EventJson> = [];

diff --git a/source/funkin/states/editors/chart/ChartGridBase.hx b/source/funkin/states/editors/chart/ChartGridBase.hx
@@ -77,6 +77,7 @@ class ChartGridBase<T:FlxObject> extends Group
 
     public function clearObject(object:T) {
         object.kill();
+        sectionMembers.remove(object);
     }
 
     public function clearMembers(onlySection:Bool = false) {

diff --git a/source/funkin/states/editors/chart/grid/ChartNoteGrid.hx b/source/funkin/states/editors/chart/grid/ChartNoteGrid.hx
@@ -22,9 +22,7 @@ class ChartNoteGrid extends ChartGridBase<ChartNote>
             if (data[0] + data[2] >= minTime)
             {
                 var note = drawObject(data);
-                if (hasArray) {
-                    pushArray.push(note);
-                }
+                if (hasArray) pushArray.push(note);
             }
         });
     }