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

Merge branch 'master' into efficient-user-retrieval

Browse Source
This commit is contained in:
Dean Herbert 2020-11-09 19:41:44 +09:00
commit d99e1ba8dd
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
View File

@ -37,6 +37,12 @@ namespace osu.Game.Tests.Editing
})); }));
} }
[Test]
public void TestPatchNoObjectChanges()
{
runTest(new OsuBeatmap());
}
[Test] [Test]
public void TestAddHitObject() public void TestAddHitObject()
{ {

4
osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
View File

@ -235,11 +235,11 @@ namespace osu.Game.Beatmaps.Formats
private void handleHitObjects(TextWriter writer) private void handleHitObjects(TextWriter writer)
{ {
writer.WriteLine("[HitObjects]");
if (beatmap.HitObjects.Count == 0) if (beatmap.HitObjects.Count == 0)
return; return;
writer.WriteLine("[HitObjects]");
foreach (var h in beatmap.HitObjects) foreach (var h in beatmap.HitObjects)
handleHitObject(writer, h); handleHitObject(writer, h);
} }

4
osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Text; using System.Text;
using DiffPlex; using DiffPlex;
@ -35,6 +36,9 @@ namespace osu.Game.Screens.Edit
int oldHitObjectsIndex = Array.IndexOf(result.PiecesOld, "[HitObjects]"); int oldHitObjectsIndex = Array.IndexOf(result.PiecesOld, "[HitObjects]");
int newHitObjectsIndex = Array.IndexOf(result.PiecesNew, "[HitObjects]"); int newHitObjectsIndex = Array.IndexOf(result.PiecesNew, "[HitObjects]");
Debug.Assert(oldHitObjectsIndex >= 0);
Debug.Assert(newHitObjectsIndex >= 0);
var toRemove = new List<int>(); var toRemove = new List<int>();
var toAdd = new List<int>(); var toAdd = new List<int>();