h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 10:57:27 +08:00
Code Issues Releases Wiki Activity

Merge branch 'legacy_beatmap_flag' into taiko_conversion

Browse Source 
Conflicts:
	osu.Game/Beatmaps/Legacy/IIsLegacy.cs
This commit is contained in:
smoogipooo 2017-03-18 18:34:00 +09:00
commit aa565274de
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Beatmaps/Legacy/IIsLegacy.cs
View File

@ -1,12 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Beatmaps.Legacy
{
/// <summary>
/// A Beatmap that was loaded from a legacy .osu beatmap file (version &lt;=15).
/// </summary>
public interface IIsLegacy
{
}
}

5
osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
View File

@ -6,15 +6,16 @@ namespace osu.Game.Beatmaps.Legacy
/// <summary> /// <summary>
/// A type of Beatmap loaded from a legacy .osu beatmap file (version &lt;=15). /// A type of Beatmap loaded from a legacy .osu beatmap file (version &lt;=15).
/// </summary> /// </summary>
internal class LegacyBeatmap : Beatmap, IIsLegacy public class LegacyBeatmap : Beatmap
{ {
/// <summary> /// <summary>
/// Constructs a new beatmap. /// Constructs a new beatmap.
/// </summary> /// </summary>
/// <param name="original">The original beatmap to use the parameters of.</param> /// <param name="original">The original beatmap to use the parameters of.</param>
public LegacyBeatmap(Beatmap original = null) internal LegacyBeatmap(Beatmap original = null)
: base(original) : base(original)
{ {
HitObjects = original?.HitObjects ?? null;
} }
} }
} }

1
osu.Game/osu.Game.csproj
View File

@ -77,7 +77,6 @@
<Compile Include="Beatmaps\IBeatmapProcessor.cs" /> <Compile Include="Beatmaps\IBeatmapProcessor.cs" />
<Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" /> <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
<Compile Include="Beatmaps\Timing\TimingInfo.cs" /> <Compile Include="Beatmaps\Timing\TimingInfo.cs" />
<Compile Include="Beatmaps\Legacy\IIsLegacy.cs" />
<Compile Include="Database\ScoreDatabase.cs" /> <Compile Include="Database\ScoreDatabase.cs" />
<Compile Include="Graphics\Backgrounds\Triangles.cs" /> <Compile Include="Graphics\Backgrounds\Triangles.cs" />
<Compile Include="Graphics\Cursor\CursorTrail.cs" /> <Compile Include="Graphics\Cursor\CursorTrail.cs" />