Skip to content

Commit 1beb39c

Browse files
committed
uh
1 parent d10ab5e commit 1beb39c

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

source/funkin/ui/charSelect/CharSelectCursors.hx

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,14 @@ class CharSelectCursors extends FlxTypedSpriteContainer<FunkinSprite>
9898
*/
9999
public function snapToLocation(intendedPosition:FlxPoint):Void
100100
{
101-
main.x = intendedPosition.x;
102-
main.y = intendedPosition.y;
103-
104-
lightBlue.x = main.x;
105-
lightBlue.y = main.y;
106-
107-
darkBlue.x = intendedPosition.x;
108-
darkBlue.y = intendedPosition.y;
101+
main.setPosition(intendedPosition.x, intendedPosition.y);
109102

110-
cursorConfirmed.x = main.x - 2;
111-
cursorConfirmed.y = main.y - 4;
103+
// Using intendedPosition since we anyway snapping them
104+
lightBlue.setPosition(intendedPosition.x, intendedPosition.y);
105+
darkBlue.setPosition(intendedPosition.x, intendedPosition.y);
112106

113-
cursorDenied.x = main.x - 2;
114-
cursorDenied.y = main.y - 4;
107+
cursorConfirmed.setPosition(main.x - 2, main.x - 4);
108+
cursorDenied.setPosition(main.x - 2, main.x - 4);
115109
}
116110

117111
/**
@@ -136,15 +130,6 @@ class CharSelectCursors extends FlxTypedSpriteContainer<FunkinSprite>
136130
cursorDenied.y = main.y - 4;
137131
}
138132

139-
public function snapToLocation(intendedPosition:FlxPoint):Void
140-
{
141-
main.setPosition(intendedPosition.x, intendedPosition.y);
142-
lightBlue.setPosition(intendedPosition.x, intendedPosition.y); // Using intendedPosition since we anyway snapping them
143-
darkBlue.setPosition(intendedPosition.x, intendedPosition.y);
144-
cursorConfirmed.setPosition(main.x - 2, main.x - 4);
145-
cursorDenied.setPosition(main.x - 2, main.x - 4);
146-
}
147-
148133
public function slide(slideIn:Bool)
149134
{
150135
if (slideIn)

source/funkin/ui/charSelect/CharSelectSubState.hx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -357,13 +357,6 @@ class CharSelectSubState extends MusicBeatSubState
357357
FlxTween.tween(member, {y: member.y - 300}, 1, {ease: FlxEase.expoOut});
358358
}
359359

360-
cursorLocIntended.x = (cursorFactor * cursorX) + (FlxG.width / 2) - cursors.main.width / 2;
361-
cursorLocIntended.y = (cursorFactor * cursorY) + (FlxG.height / 2) - cursors.main.height / 2;
362-
363-
cursorLocIntended.x += cursorOffsetX;
364-
cursorLocIntended.y += cursorOffsetY;
365-
366-
cursors.snapToLocation(cursorLocIntended);
367360
cursors.slide(true);
368361

369362
FlxG.debugger.addTrackerProfile(new TrackerProfile(CharSelectSubState, ["curChar", "grpXSpread", "grpYSpread"]));

0 commit comments

Comments
 (0)