From 3cbba8ba29dda790597e29e01c9e7d620953169d Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 19 Sep 2024 04:22:05 -0400
Subject: [PATCH] Resolve merge issues.
---
source/funkin/play/PlayState.hx | 1 -
source/funkin/play/components/PopUpStuff.hx | 9 ---------
source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- 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
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -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
index 19391f8d9..d2a27999f 100644
--- 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()