diff --git a/osu.Game.Rulesets.Swing.Tests/VisualTestRunner.cs b/osu.Game.Rulesets.Swing.Tests/VisualTestRunner.cs index a4cf73b..a744b2e 100644 --- a/osu.Game.Rulesets.Swing.Tests/VisualTestRunner.cs +++ b/osu.Game.Rulesets.Swing.Tests/VisualTestRunner.cs @@ -10,7 +10,7 @@ public static class VisualTestRunner [STAThread] public static int Main(string[] args) { - using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true)) + using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu")) { host.Run(new OsuTestBrowser()); return 0; diff --git a/osu.Game.Rulesets.Swing/Beatmaps/SwingBeatmapConverter.cs b/osu.Game.Rulesets.Swing/Beatmaps/SwingBeatmapConverter.cs index cac355e..8b22684 100644 --- a/osu.Game.Rulesets.Swing/Beatmaps/SwingBeatmapConverter.cs +++ b/osu.Game.Rulesets.Swing/Beatmaps/SwingBeatmapConverter.cs @@ -58,7 +58,7 @@ protected override IEnumerable ConvertHitObject(HitObject obj, I case IHasDuration endTimeData: { - double hitMultiplier = IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty, 3, 5, 7.5) * spinner_hit_multiplier; + double hitMultiplier = IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.Difficulty.OverallDifficulty, 3, 5, 7.5) * spinner_hit_multiplier; return new List { diff --git a/osu.Game.Rulesets.Swing/UI/DrawableSwingRuleset.cs b/osu.Game.Rulesets.Swing/UI/DrawableSwingRuleset.cs index 74df636..3f3a376 100644 --- a/osu.Game.Rulesets.Swing/UI/DrawableSwingRuleset.cs +++ b/osu.Game.Rulesets.Swing/UI/DrawableSwingRuleset.cs @@ -87,7 +87,7 @@ private static List generate(IBeatmap beatmap) if (timingPoints.Count == 0) return bars; - var timePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450); + var timePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.Difficulty.ApproachRate, 1800, 1200, 450); for (int i = 0; i < timingPoints.Count; i++) { @@ -95,9 +95,9 @@ private static List generate(IBeatmap beatmap) int currentBeat = 0; // Stop on the beat before the next timing point, or if there is no next timing point stop slightly past the last object - double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time - currentTimingPoint.BeatLength : lastHitTime + currentTimingPoint.BeatLength * (int)currentTimingPoint.TimeSignature; + double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time - currentTimingPoint.BeatLength : lastHitTime + currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator; - double barLength = currentTimingPoint.BeatLength * (int)currentTimingPoint.TimeSignature; + double barLength = currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator; for (double t = currentTimingPoint.Time; Precision.DefinitelyBigger(endTime, t); t += barLength, currentBeat++) { @@ -111,7 +111,7 @@ private static List generate(IBeatmap beatmap) t = roundedTime; } - bool major = currentBeat % (int)currentTimingPoint.TimeSignature == 0; + bool major = currentBeat % currentTimingPoint.TimeSignature.Numerator == 0; bars.AddRange(new[] { diff --git a/osu.Game.Rulesets.Swing/osu.Game.Rulesets.Swing.csproj b/osu.Game.Rulesets.Swing/osu.Game.Rulesets.Swing.csproj index 98880ba..072c431 100644 --- a/osu.Game.Rulesets.Swing/osu.Game.Rulesets.Swing.csproj +++ b/osu.Game.Rulesets.Swing/osu.Game.Rulesets.Swing.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file