h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 15:22:55 +08:00
Code Issues Releases Wiki Activity

Update RulesetInputManager to use new method

Browse Source
This commit is contained in:
Dean Herbert 2020-07-01 18:54:11 +09:00
parent 6f6376d53c
commit 49aa839872
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -18,9 +18,6 @@ using osu.Game.Input.Handlers;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osuTK.Input; using osuTK.Input;
using static osu.Game.Input.Handlers.ReplayInputHandler; using static osu.Game.Input.Handlers.ReplayInputHandler;
using JoystickState = osu.Framework.Input.States.JoystickState;
using KeyboardState = osu.Framework.Input.States.KeyboardState;
using MouseState = osu.Framework.Input.States.MouseState;
namespace osu.Game.Rulesets.UI namespace osu.Game.Rulesets.UI
{ {
@ -42,11 +39,7 @@ namespace osu.Game.Rulesets.UI
} }
} }
protected override InputState CreateInitialState() protected override InputState CreateInitialState() => new RulesetInputManagerInputState<T>(base.CreateInitialState());
{
var state = base.CreateInitialState();
return new RulesetInputManagerInputState<T>(state.Mouse, state.Keyboard, state.Joystick);
}
protected readonly KeyBindingContainer<T> KeyBindingContainer; protected readonly KeyBindingContainer<T> KeyBindingContainer;
@ -203,8 +196,8 @@ namespace osu.Game.Rulesets.UI
{ {
public ReplayState<T> LastReplayState; public ReplayState<T> LastReplayState;
public RulesetInputManagerInputState(MouseState mouse = null, KeyboardState keyboard = null, JoystickState joystick = null) public RulesetInputManagerInputState(InputState state = null)
: base(mouse, keyboard, joystick) : base(state)
{ {
} }
} }