RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid multiple iteration of LINQ query using a local

This commit is contained in:
Dean Herbert 2022-08-16 15:38:13 +09:00
parent 7cc9fdbaa0
commit 0833a6fb9a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -348,13 +348,15 @@ private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
private void mergeSelection()
{
if (selectedMergeableObjects.Length < 2)
var mergeableObjects = selectedMergeableObjects;
if (mergeableObjects.Length < 2)
return;
ChangeHandler?.BeginChange();
// Have an initial slider object.
var firstHitObject = selectedMergeableObjects[0];
var firstHitObject = mergeableObjects[0];
var mergedHitObject = firstHitObject as Slider ?? new Slider
{
StartTime = firstHitObject.StartTime,
@ -371,7 +373,7 @@ private void mergeSelection()
// Merge all the selected hit objects into one slider path.
bool lastCircle = firstHitObject is HitCircle;
foreach (var selectedMergeableObject in selectedMergeableObjects.Skip(1))
foreach (var selectedMergeableObject in mergeableObjects.Skip(1))
{
if (selectedMergeableObject is IHasPath hasPath)
{
@ -407,14 +409,14 @@ private void mergeSelection()
// Make sure only the merged hit object is in the beatmap.
if (firstHitObject is Slider)
{
foreach (var selectedMergeableObject in selectedMergeableObjects.Skip(1))
foreach (var selectedMergeableObject in mergeableObjects.Skip(1))
{
EditorBeatmap.Remove(selectedMergeableObject);
}
}
else
{
foreach (var selectedMergeableObject in selectedMergeableObjects)
foreach (var selectedMergeableObject in mergeableObjects)
{
EditorBeatmap.Remove(selectedMergeableObject);
}