h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 16:42:55 +08:00
Code Issues Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
EVAST9919 2017-05-14 10:26:52 +03:00
parent 2b95b92429
commit b6460d89c9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Graphics/Cursor/GameplayCursor.cs
View File

@ -44,9 +44,9 @@ namespace osu.Game.Graphics.Cursor
private Bindable<double> cursorScale; private Bindable<double> cursorScale;
private Bindable<bool> autoCursorScale; private Bindable<bool> autoCursorScale;
private float beatmapCircleSize;
private const float default_beatmap_cs = 5f;
private float beatmapCircleSize;
private const int default_circle_size = 5;
private float autoScaleMultiplier => autoCursorScale ? (float)(1 - 0.7 * (beatmapCircleSize - 4) / 5) : 1f; private float autoScaleMultiplier => autoCursorScale ? (float)(1 - 0.7 * (beatmapCircleSize - 4) / 5) : 1f;
@ -56,8 +56,8 @@ namespace osu.Game.Graphics.Cursor
Size = new Vector2(42); Size = new Vector2(42);
} }
[BackgroundDependencyLoader(permitNulls:true)] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, OsuGame game) private void load(OsuConfigManager config, OsuGameBase game)
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
@ -121,7 +121,7 @@ namespace osu.Game.Graphics.Cursor
}, },
}; };
beatmapCircleSize = game?.Beatmap?.Value.Beatmap.BeatmapInfo.Difficulty.CircleSize ?? default_beatmap_cs; beatmapCircleSize = game.Beatmap.Value?.Beatmap.BeatmapInfo.Difficulty.CircleSize ?? default_circle_size;
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize); cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
autoCursorScale = config.GetBindable<bool>(OsuConfig.AutoCursorSize); autoCursorScale = config.GetBindable<bool>(OsuConfig.AutoCursorSize);
@ -133,7 +133,7 @@ namespace osu.Game.Graphics.Cursor
private void calculateScale() private void calculateScale()
{ {
cursorContainer.Scale = new Vector2(autoScaleMultiplier * (float)cursorScale); cursorContainer.Scale = new Vector2((float)(autoScaleMultiplier * cursorScale));
} }
} }
} }