diff --git a/StarControl/Menus/RadialMenuController.cs b/StarControl/Menus/RadialMenuController.cs index bac2d0f..46b5234 100644 --- a/StarControl/Menus/RadialMenuController.cs +++ b/StarControl/Menus/RadialMenuController.cs @@ -171,7 +171,6 @@ public void Update(TimeSpan elapsed) ); InputPatches.AwaitRightStickMoveForCursor(); InputPatches.ForceHideCursor = true; - ResetMouseToPlayer(); InputPatches.NotifyMousePositionReset(); AnimateMenuOpen(elapsed); // Skip "zero" frame } @@ -355,7 +354,6 @@ private void Reset(bool fromActivation = false) RestoreHudState(); if (usedRightStickInMenu) { - ResetMouseToPlayer(); InputPatches.SuppressRightStickFor(InputPatches.RightStickSuppressionDuration); } if (Game1.player is not null) @@ -691,32 +689,5 @@ private Vector2 SelectThumbstick(Vector2 left, Vector2 right) return left; } - private static void ResetMouseToPlayer() - { - var player = Game1.player; - if (player is null) - { - return; - } - var facingOffset = player.FacingDirection switch - { - 0 => new Vector2(0, -1), // Up - 1 => new Vector2(1, 0), // Right - 2 => new Vector2(0, 1), // Down - 3 => new Vector2(-1, 0), // Left - _ => Vector2.Zero, - }; - var standingPos = player.getStandingPosition(); - var targetTile = - new Vector2( - (int)(standingPos.X / Game1.tileSize), - (int)(standingPos.Y / Game1.tileSize) - ) + facingOffset; - var targetPos = - targetTile * Game1.tileSize + new Vector2(Game1.tileSize / 2f, Game1.tileSize / 2f); - var viewport = Game1.viewport; - var cursorX = (int)(targetPos.X - viewport.X); - var cursorY = (int)(targetPos.Y - viewport.Y); - Game1.setMousePosition(cursorX, cursorY); - } + }