sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into beatmap-cancellation-token

Browse Source
This commit is contained in:
Dean Herbert
2021-11-17 11:15:31 +09:00
parent 4d11794d31 0146987eba
commit 0715d40ea0
69 changed files with 315 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
View File

@ -28,10 +28,10 @@ namespace osu.Game.Rulesets.Difficulty
private Mod[] playableMods;
private double clockRate;
private readonly Ruleset ruleset;
private readonly WorkingBeatmap beatmap;
private readonly IRulesetInfo ruleset;
private readonly IWorkingBeatmap beatmap;
protected DifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
protected DifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
{
this.ruleset = ruleset;
this.beatmap = beatmap;
@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Difficulty
{
playableMods = mods.Select(m => m.DeepClone()).ToArray();
Beatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, playableMods, cancellationToken: cancellationToken);
Beatmap = beatmap.GetPlayableBeatmap(ruleset, playableMods, cancellationToken);
var track = new TrackVirtual(10000);
playableMods.OfType<IApplicableToTrack>().ForEach(m => m.ApplyToTrack(track));