h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 19:52:57 +08:00
Code Issues Releases Wiki Activity

Fix post-rebase issues.

Browse Source
This commit is contained in:
smoogipooo 2017-03-17 00:38:40 +09:00
parent 9f6f581b64
commit faacac331d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Modes.Osu/Objects/OsuHitObject.cs
View File

@ -68,7 +68,7 @@ namespace osu.Game.Modes.Osu.Objects
return OsuScoreResult.Miss;
}
public override void ApplyDefaults(TimingInfo timing, BaseDifficulty difficulty)
public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(timing, difficulty);

2
osu.Game.Modes.Osu/Objects/Slider.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Modes.Osu.Objects
public double Velocity;
public double TickDistance;
public override void ApplyDefaults(TimingInfo timing, BaseDifficulty difficulty)
public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(timing, difficulty);

2
osu.Game/Modes/Objects/HitObject.cs
View File

@ -30,6 +30,6 @@ namespace osu.Game.Modes.Objects
/// </summary>
/// <param name="difficulty">The difficulty settings to use.</param>
/// <param name="timing">The timing settings to use.</param>
public virtual void ApplyDefaults(TimingInfo timing, BaseDifficulty difficulty) { }
public virtual void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty) { }
}
}

2
osu.Game/Modes/UI/HitRenderer.cs
View File

@ -96,7 +96,7 @@ namespace osu.Game.Modes.UI
// Apply defaults
foreach (var h in Beatmap.HitObjects)
h.ApplyDefaults(Beatmap.TimingInfo, Beatmap.BeatmapInfo.BaseDifficulty);
h.ApplyDefaults(Beatmap.TimingInfo, Beatmap.BeatmapInfo.Difficulty);
// Post-process the beatmap
processor.PostProcess(Beatmap);