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

Merge pull request #5554 from smoogipoo/workingbeatmap-beatmap-mods

Browse Source 
Move IApplicableToBeatmap application to WorkingBeatmap
This commit is contained in:
Dean Herbert 2019-08-01 13:31:18 +08:00 committed by GitHub
commit b3044ed18d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -141,6 +141,9 @@ namespace osu.Game.Beatmaps
processor?.PostProcess(); processor?.PostProcess();
foreach (var mod in mods.OfType<IApplicableToBeatmap>())
mod.ApplyToBeatmap(converted);
return converted; return converted;
} }

15
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -109,8 +109,6 @@ namespace osu.Game.Rulesets.UI
Beatmap = (Beatmap<TObject>)workingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, mods); Beatmap = (Beatmap<TObject>)workingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
applyBeatmapMods(mods);
KeyBindingInputManager = CreateInputManager(); KeyBindingInputManager = CreateInputManager();
playfield = new Lazy<Playfield>(CreatePlayfield); playfield = new Lazy<Playfield>(CreatePlayfield);
@ -269,19 +267,6 @@ namespace osu.Game.Rulesets.UI
public override ScoreProcessor CreateScoreProcessor() => new ScoreProcessor<TObject>(this); public override ScoreProcessor CreateScoreProcessor() => new ScoreProcessor<TObject>(this);
/// <summary>
/// Applies the active mods to the Beatmap.
/// </summary>
/// <param name="mods"></param>
private void applyBeatmapMods(IReadOnlyList<Mod> mods)
{
if (mods == null)
return;
foreach (var mod in mods.OfType<IApplicableToBeatmap>())
mod.ApplyToBeatmap(Beatmap);
}
/// <summary> /// <summary>
/// Applies the active mods to this DrawableRuleset. /// Applies the active mods to this DrawableRuleset.
/// </summary> /// </summary>