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

Fix control points being flushed too late

Browse Source
This commit is contained in:
smoogipoo 2019-10-30 18:02:18 +09:00
parent 45af796943
commit cf2d885099
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
View File

@ -262,6 +262,21 @@ namespace osu.Game.Tests.Beatmaps.Formats
} }
} }
[Test]
public void TestTimingPointResetsSpeedMultiplier()
{
var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
using (var resStream = TestResources.OpenResource("timingpoint-speedmultiplier-reset.osu"))
using (var stream = new LineBufferedReader(resStream))
{
var controlPoints = decoder.Decode(stream).ControlPointInfo;
Assert.That(controlPoints.DifficultyPointAt(0).SpeedMultiplier, Is.EqualTo(0.5).Within(0.1));
Assert.That(controlPoints.DifficultyPointAt(2000).SpeedMultiplier, Is.EqualTo(1).Within(0.1));
}
}
[Test] [Test]
public void TestDecodeBeatmapColours() public void TestDecodeBeatmapColours()
{ {

5
osu.Game.Tests/Resources/timingpoint-speedmultiplier-reset.osu Normal file
View File

@ -0,0 +1,5 @@
osu file format v14
[TimingPoints]
0,-200,4,1,0,100,0,0
2000,100,1,1,0,100,1,0

6
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -411,15 +411,15 @@ namespace osu.Game.Beatmaps.Formats
private void addControlPoint(double time, ControlPoint point, bool timingChange) private void addControlPoint(double time, ControlPoint point, bool timingChange)
{ {
if (time != pendingControlPointsTime)
flushPendingPoints();
if (timingChange) if (timingChange)
{ {
beatmap.ControlPointInfo.Add(time, point); beatmap.ControlPointInfo.Add(time, point);
return; return;
} }
if (time != pendingControlPointsTime)
flushPendingPoints();
pendingControlPoints.Add(point); pendingControlPoints.Add(point);
pendingControlPointsTime = time; pendingControlPointsTime = time;
} }