h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:52:55 +08:00
Code Issues Releases Wiki Activity

Move second call to shiftNestedObjects to a more understandable location

Browse Source
This commit is contained in:
Dean Herbert 2021-05-26 16:48:16 +09:00
parent d6c4be207b
commit a08a4aa911
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
View File

@ -91,8 +91,13 @@ namespace osu.Game.Rulesets.Osu.Mods
{
case Slider slider:
shiftNestedObjects(slider, Vector2.Subtract(slider.Position, current.PositionOriginal));
var oldPos = new Vector2(slider.Position.X, slider.Position.Y);
moveSliderIntoPlayfield(slider, current);
shiftNestedObjects(slider, Vector2.Subtract(slider.Position, oldPos));
break;
}
@ -151,8 +156,6 @@ namespace osu.Game.Rulesets.Osu.Mods
/// </summary>
private void moveSliderIntoPlayfield(Slider slider, RandomObjectInfo currentObjectInfo)
{
var oldPos = new Vector2(slider.Position.X, slider.Position.Y);
// Min. distances from the slider's position to the playfield border
var minMargin = new MarginPadding();
@ -181,10 +184,6 @@ namespace osu.Game.Rulesets.Osu.Mods
currentObjectInfo.PositionRandomised = slider.Position;
currentObjectInfo.EndPositionRandomised = slider.EndPosition;
var shift = Vector2.Subtract(slider.Position, oldPos);
shiftNestedObjects(slider, shift);
}
/// <summary>