diff --git a/osu.Desktop.Tests/Visual/TestCaseKeyConfiguration.cs b/osu.Desktop.Tests/Visual/TestCaseKeyConfiguration.cs index 77db6e7b91..41e0c25507 100644 --- a/osu.Desktop.Tests/Visual/TestCaseKeyConfiguration.cs +++ b/osu.Desktop.Tests/Visual/TestCaseKeyConfiguration.cs @@ -1,6 +1,8 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Overlays; + namespace osu.Desktop.Tests.Visual { public class TestCaseKeyConfiguration : OsuTestCase diff --git a/osu.Game/Input/Bindings/DatabasedKeyBinding.cs b/osu.Game/Input/Bindings/DatabasedKeyBinding.cs index c0197ce3dc..cbf74d6984 100644 --- a/osu.Game/Input/Bindings/DatabasedKeyBinding.cs +++ b/osu.Game/Input/Bindings/DatabasedKeyBinding.cs @@ -29,10 +29,10 @@ namespace osu.Game.Input.Bindings [Indexed] [Column("Action")] - public new int Action + public int IntAction { - get { return (int)base.Action; } - set { base.Action = value; } + get { return (int)Action; } + set { Action = value; } } } } \ No newline at end of file diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs index 057fa4d4e7..95fdaba339 100644 --- a/osu.Game/Input/KeyBindingStore.cs +++ b/osu.Game/Input/KeyBindingStore.cs @@ -74,7 +74,7 @@ namespace osu.Game.Input Connection.Insert(new DatabasedKeyBinding { KeyCombination = insertable.KeyCombination, - Action = (int)insertable.Action, + Action = insertable.Action, RulesetID = rulesetId, Variant = variant });