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

Fix post-rebase errors.

Browse Source
This commit is contained in:
smoogipooo 2017-04-18 09:00:53 +09:00
parent 04973ae65e
commit 786446354e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs
View File

@ -7,10 +7,8 @@ using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
using osu.Game.Modes.Objects.Legacy;
using System.Linq; using System.Linq;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Objects.Types; using osu.Game.Modes.Objects.Types;
namespace osu.Game.Tests.Beatmaps.Formats namespace osu.Game.Tests.Beatmaps.Formats

2
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Beatmaps.Formats
case @"Mode": case @"Mode":
beatmap.BeatmapInfo.RulesetID = int.Parse(val); beatmap.BeatmapInfo.RulesetID = int.Parse(val);
switch (beatmap.BeatmapInfo.Mode) switch (beatmap.BeatmapInfo.RulesetID)
{ {
case 0: case 0:
parser = new Modes.Objects.Legacy.Osu.HitObjectParser(); parser = new Modes.Objects.Legacy.Osu.HitObjectParser();

4
osu.Game/Screens/Play/Player.cs
View File

@ -80,13 +80,13 @@ namespace osu.Game.Screens.Play
try try
{ {
// Try using the preferred user ruleset // Try using the preferred user ruleset
ruleset = osu == null ? Beatmap.BeatmapInfo.Ruleset : osu.Ruleset; ruleset = osu == null ? Beatmap.BeatmapInfo.Ruleset.CreateInstance() : osu.Ruleset.Value.CreateInstance();
HitRenderer = ruleset.CreateHitRendererWith(Beatmap); HitRenderer = ruleset.CreateHitRendererWith(Beatmap);
} }
catch (BeatmapInvalidForModeException) catch (BeatmapInvalidForModeException)
{ {
// Default to the beatmap ruleset // Default to the beatmap ruleset
ruleset = Beatmap.BeatmapInfo.Ruleset; ruleset = Beatmap.BeatmapInfo.Ruleset.CreateInstance();
HitRenderer = ruleset.CreateHitRendererWith(Beatmap); HitRenderer = ruleset.CreateHitRendererWith(Beatmap);
} }
} }