Merge remote-tracking branch 'upstream/master' into warning_fixes

This commit is contained in:
Dean Herbert
2017-02-28 13:49:19 +09:00
35 changed files with 195 additions and 179 deletions

View File

@ -43,7 +43,7 @@ namespace osu.Game.Graphics.Cursor
class OsuCursor : Container
{
private Container cursorContainer;
private BindableDouble cursorScale;
private Bindable<double> cursorScale;
public OsuCursor()
{
@ -54,7 +54,7 @@ namespace osu.Game.Graphics.Cursor
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
cursorScale = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize);
cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
Children = new Drawable[]
{