fix develop branch cuz git is on crack
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user