From b6fb68c6e2ea6cf45d5cf7e61f91596b0ac373e1 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 12 Aug 2017 22:10:57 +0900 Subject: [PATCH] Update framework --- osu-framework | 2 +- osu.Game/Input/Bindings/DatabasedKeyBinding.cs | 7 +++++-- osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/osu-framework b/osu-framework index 67d89a3601..2a56eb0619 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 67d89a36016f98c0ede576b859a2ccafe114fce8 +Subproject commit 2a56eb0619adf654ed4927af1a4b227596c87494 diff --git a/osu.Game/Input/Bindings/DatabasedKeyBinding.cs b/osu.Game/Input/Bindings/DatabasedKeyBinding.cs index cb571cdf04..278033899c 100644 --- a/osu.Game/Input/Bindings/DatabasedKeyBinding.cs +++ b/osu.Game/Input/Bindings/DatabasedKeyBinding.cs @@ -1,3 +1,6 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + using osu.Framework.Input.Bindings; using osu.Game.Rulesets; using SQLite.Net.Attributes; @@ -17,8 +20,8 @@ namespace osu.Game.Input.Bindings [Column("Keys")] public string KeysString { - get { return Keys.ToString(); } - private set { Keys = value; } + get { return KeyCombination.ToString(); } + private set { KeyCombination = value; } } [Column("Action")] diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs index ab744c8037..5c62f1ddc8 100644 --- a/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs +++ b/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs @@ -1,3 +1,6 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + using osu.Framework.Allocation; using osu.Framework.Input.Bindings; using osu.Game.Rulesets; @@ -47,7 +50,7 @@ namespace osu.Game.Input.Bindings if (store != null) { foreach (var b in store.Query(b => b.RulesetID == rulesetId && b.Variant == variant)) - Mappings.Add(b); + KeyBindings.Add(b); } } }