Propagate framework updates

This commit is contained in:
Dean Herbert
2017-08-12 19:54:07 +09:00
parent 48d4ed55e9
commit 99458aab48
8 changed files with 29 additions and 29 deletions

View File

@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu
{
public class OsuInputManager : DatabasedKeyBindingInputManager<OsuAction>
{
public OsuInputManager(RulesetInfo ruleset) : base(ruleset, concurrencyMode: ConcurrentActionMode.UniqueActions)
public OsuInputManager(RulesetInfo ruleset) : base(ruleset, simultaneousMode: SimultaneousBindingMode.Unique)
{
}
@ -34,12 +34,12 @@ namespace osu.Game.Rulesets.Osu
}
}
protected override IDictionary<KeyCombination, OsuAction> CreateDefaultMappings() => new Dictionary<KeyCombination, OsuAction>
protected override IEnumerable<KeyBinding> CreateDefaultMappings() => new[]
{
{ Key.Z, OsuAction.LeftButton },
{ Key.X, OsuAction.RightButton },
{ Key.LastKey + 1, OsuAction.LeftButton },
{ Key.LastKey + 2, OsuAction.RightButton },
new KeyBinding(Key.Z, OsuAction.LeftButton),
new KeyBinding(Key.X, OsuAction.RightButton),
new KeyBinding(Key.LastKey + 1, OsuAction.LeftButton),
new KeyBinding(Key.LastKey + 2, OsuAction.RightButton),
};
}