fix compilation

FunkinCrew · Sep 24, 2024 · 2de7b94 · 2de7b94
1 parent 3ef238a
commit 2de7b94
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/hmm.json b/hmm.json
@@ -94,13 +94,6 @@
       "ref": "61b98a7a353b7f529a8fec84ed9afc919a2dffdd",
       "url": "https://github.com/FunkinCrew/hxCodec"
     },
-    {
-      "name": "hxcpp",
-      "type": "git",
-      "dir": null,
-      "ref": "904ea40643b050a5a154c5e4c33a83fd2aec18b1",
-      "url": "https://github.com/HaxeFoundation/hxcpp"
-    },
     {
       "name": "hxcpp-debug-server",
       "type": "git",
@@ -145,7 +138,7 @@
       "name": "lime",
       "type": "git",
       "dir": null,
-      "ref": "fe3368f611a84a19afc03011353945ae4da8fffd",
+      "ref": "872ff6db2f2d27c0243d4ff76802121ded550dd7",
       "url": "https://github.com/FunkinCrew/lime"
     },
     {

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;

diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
@@ -73,7 +73,7 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       });
   }
 
-  public function displayCombo(combo:Int = 0):Void
+  public function displayCombo(combo:Int = 0)
   {
     var seperatedScore:Array<Int> = [];
     var tempCombo:Int = combo;
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()