diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs index 9c0d05d4cd..9c9b06fcea 100644 --- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs +++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs @@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Replays { } - protected override bool IsImportant(CatchReplayFrame frame) => frame.X > 0; + protected override bool IsImportant(CatchReplayFrame frame) => frame.Position > 0; protected float? Position { @@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Replays if (!HasFrames) return null; - return Interpolation.ValueAt(CurrentTime, CurrentFrame.X, NextFrame.X, CurrentFrame.Time, NextFrame.Time); + return Interpolation.ValueAt(CurrentTime, CurrentFrame.Position, NextFrame.Position, CurrentFrame.Time, NextFrame.Time); } } @@ -37,9 +37,9 @@ namespace osu.Game.Rulesets.Catch.Replays if (CurrentFrame.Dashing) actions.Add(CatchAction.Dash); - if (Position.Value > CurrentFrame.X) + if (Position.Value > CurrentFrame.Position) actions.Add(CatchAction.MoveRight); - else if (Position.Value < CurrentFrame.X) + else if (Position.Value < CurrentFrame.Position) actions.Add(CatchAction.MoveLeft); return new List diff --git a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs index d45223a1cb..3b2d0d58b3 100644 --- a/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs +++ b/osu.Game.Rulesets.Catch/Replays/CatchReplayFrame.cs @@ -10,24 +10,24 @@ namespace osu.Game.Rulesets.Catch.Replays { public class CatchReplayFrame : ReplayFrame, IConvertibleReplayFrame { - public float X; + public float Position; public bool Dashing; public CatchReplayFrame() { } - public CatchReplayFrame(double time, float? x = null, bool dashing = false) + public CatchReplayFrame(double time, float? position = null, bool dashing = false) : base(time) { - X = x ?? -1; + Position = position ?? -1; Dashing = dashing; } public void ConvertFrom(LegacyReplayFrame legacyFrame, Beatmap beatmap) { // Todo: This needs to be re-scaled - X = legacyFrame.Position.X; + Position = legacyFrame.Position.X; Dashing = legacyFrame.ButtonState == ReplayButtonState.Left1; } }