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

CreateReplayFrame -> CreateConvertibleReplayFrame

Browse Source
This commit is contained in:
smoogipoo 2018-03-01 01:32:32 +09:00
parent ab4d7fa46e
commit c9c65cab53
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Catch/CatchRuleset.cs
View File

@ -11,7 +11,7 @@ using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.Catch.Replays;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Replays.Types;
namespace osu.Game.Rulesets.Catch
{
@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Catch
public override int LegacyID => 2;
public override ReplayFrame CreateReplayFrame() => new CatchReplayFrame();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
public CatchRuleset(RulesetInfo rulesetInfo = null)
: base(rulesetInfo)

4
osu.Game.Rulesets.Mania/ManiaRuleset.cs
View File

@ -13,7 +13,7 @@ using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Replays;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Replays.Types;
namespace osu.Game.Rulesets.Mania
{
@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Mania
public override int LegacyID => 3;
public override ReplayFrame CreateReplayFrame() => new ManiaReplayFrame();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
public ManiaRuleset(RulesetInfo rulesetInfo = null)
: base(rulesetInfo)

4
osu.Game.Rulesets.Osu/OsuRuleset.cs
View File

@ -20,7 +20,7 @@ using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Replays;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Replays.Types;
namespace osu.Game.Rulesets.Osu
{
@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Osu
public override int LegacyID => 0;
public override ReplayFrame CreateReplayFrame() => new OsuReplayFrame();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
public OsuRuleset(RulesetInfo rulesetInfo = null)
: base(rulesetInfo)

4
osu.Game.Rulesets.Taiko/TaikoRuleset.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Rulesets.UI;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Replays.Types;
using osu.Game.Rulesets.Taiko.Replays;
namespace osu.Game.Rulesets.Taiko
@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Taiko
public override int LegacyID => 1;
public override ReplayFrame CreateReplayFrame() => new TaikoReplayFrame();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
public TaikoRuleset(RulesetInfo rulesetInfo = null)
: base(rulesetInfo)

4
osu.Game/Rulesets/Ruleset.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Replays.Types;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
@ -90,7 +90,7 @@ namespace osu.Game.Rulesets
/// <returns>A descriptive name of the variant.</returns>
public virtual string GetVariantName(int variant) => string.Empty;
public virtual ReplayFrame CreateReplayFrame() => new ReplayFrame();
public virtual IConvertibleReplayFrame CreateConvertibleReplayFrame() => null;
/// <summary>
/// Create a ruleset info based on this ruleset.

11
osu.Game/Rulesets/Scoring/Legacy/LegacyScoreParser.cs
View File

@ -1,12 +1,12 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.IO;
using osu.Game.Beatmaps;
using osu.Game.IO.Legacy;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Replays.Legacy;
using osu.Game.Rulesets.Replays.Types;
using osu.Game.Users;
using SharpCompress.Compressors.LZMA;
@ -139,13 +139,12 @@ namespace osu.Game.Rulesets.Scoring.Legacy
private ReplayFrame convertFrame(LegacyReplayFrame legacyFrame)
{
var converted = currentRuleset.CreateReplayFrame();
converted.Time = legacyFrame.Time;
if (converted is IConvertibleReplayFrame convertible)
var convertible = currentRuleset.CreateConvertibleReplayFrame();
if (convertible == null)
throw new InvalidOperationException($"Legacy replay cannot be converted for the ruleset: {currentRuleset.Description}");
convertible.ConvertFrom(legacyFrame, currentScore, currentBeatmap);
return converted;
return (ReplayFrame)convertible;
}
}
}