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

Pass through method instead of instantiating object.

Browse Source
This commit is contained in:
smoogipooo
2017-03-16 17:24:41 +09:00
parent 0c47638820
commit 9f6f581b64
6 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@ using OpenTK;
using osu.Game.Modes.Osu.Objects.Drawables;
using osu.Game.Modes.Objects.Types;
using OpenTK.Graphics;
using osu.Game.Beatmaps.Timing;
using osu.Game.Database;
namespace osu.Game.Modes.Osu.Objects
{
@ -66,11 +68,11 @@ namespace osu.Game.Modes.Osu.Objects
return OsuScoreResult.Miss;
}
public override void ApplyDefaults(HitObjectDefaults defaults)
public override void ApplyDefaults(TimingInfo timing, BaseDifficulty difficulty)
{
base.ApplyDefaults(defaults);
base.ApplyDefaults(timing, difficulty);
Scale = (1.0f - 0.7f * (defaults.Difficulty.CircleSize - 5) / 5) / 2;
Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
}
}
}