From 580584a0151746b51a1cb7118d42e33ede1109b3 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 15 Feb 2017 12:36:47 +0900 Subject: [PATCH] Don't use osu! mode parser for other game modes for now (convert still works). --- osu.Game.Modes.Catch/CatchRuleset.cs | 2 +- osu.Game.Modes.Mania/ManiaRuleset.cs | 2 +- osu.Game.Modes.Taiko/TaikoRuleset.cs | 2 +- osu.Game/Modes/Objects/NullHitObjectParser.cs | 14 ++++++++++++++ osu.Game/osu.Game.csproj | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 osu.Game/Modes/Objects/NullHitObjectParser.cs diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index 5b681badd7..5db11737f4 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -24,6 +24,6 @@ public class CatchRuleset : Ruleset public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null; - public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); + public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser(); } } diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index 75f7d93228..654a4ddaa6 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -25,6 +25,6 @@ public class ManiaRuleset : Ruleset public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null; - public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); + public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser(); } } diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs index c5d5ff5805..bd20608d57 100644 --- a/osu.Game.Modes.Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -25,6 +25,6 @@ public class TaikoRuleset : Ruleset public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null; - public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); + public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser(); } } diff --git a/osu.Game/Modes/Objects/NullHitObjectParser.cs b/osu.Game/Modes/Objects/NullHitObjectParser.cs new file mode 100644 index 0000000000..4f06d5ab26 --- /dev/null +++ b/osu.Game/Modes/Objects/NullHitObjectParser.cs @@ -0,0 +1,14 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + + +namespace osu.Game.Modes.Objects +{ + /// + /// Returns null HitObjects but at least allows us to run. + /// + public class NullHitObjectParser : HitObjectParser + { + public override HitObject Parse(string text) => null; + } +} diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 858da59ed5..ed49590dbd 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -77,6 +77,7 @@ +