RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-03 12:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

General fixups.

Browse Source
This commit is contained in:
smoogipooo 2017-03-12 01:26:07 +09:00
parent 77a4a896c9
commit 1c7a9e3a07
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,9 +93,9 @@ namespace osu.Game.Modes.Catch
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
public override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter<CatchBaseHit>()
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<CatchBaseHit>)new CatchBeatmapConverter();
return (IBeatmapConverter<T>)new CatchBeatmapConverter();
}
}
}

6
osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
View File

@ -12,11 +12,9 @@ namespace osu.Game.Modes.Mania
{
protected override PlayMode PlayMode => PlayMode.Mania;
private int columns;
public ManiaDifficultyCalculator(Beatmap beatmap, int columns = 5) : base(beatmap)
public ManiaDifficultyCalculator(Beatmap beatmap)
: base(beatmap)
{
this.columns = columns;
}
protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)

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

@ -108,9 +108,9 @@ namespace osu.Game.Modes.Mania
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
public override IBeatmapConverter<ManiaBaseHit> CreateBeatmapConverter<ManiaBaseHit>()
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<ManiaBaseHit>)new ManiaBeatmapConverter();
return (IBeatmapConverter<T>)new ManiaBeatmapConverter();
}
}
}

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

@ -120,9 +120,9 @@ namespace osu.Game.Modes.Osu
new KeyCounterMouse(MouseButton.Right)
};
public override IBeatmapConverter<OsuHitObject> CreateBeatmapConverter<OsuHitObject>()
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<OsuHitObject>)new OsuBeatmapConverter();
return (IBeatmapConverter<T>)new OsuBeatmapConverter();
}
}
}

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

@ -94,9 +94,9 @@ namespace osu.Game.Modes.Taiko
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new TaikoDifficultyCalculator(beatmap);
public override IBeatmapConverter<TaikoBaseHit> CreateBeatmapConverter<TaikoBaseHit>()
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<TaikoBaseHit>)new TaikoBeatmapConverter();
return (IBeatmapConverter<T>)new TaikoBeatmapConverter();
}
}
}

1
osu.Game/Beatmaps/Beatmap.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps.Timing;
using osu.Game.Database;
using osu.Game.Modes;
using osu.Game.Modes.Objects;
using System.Collections.Generic;