sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make KeysPerSecondCalculator dependency in HUDOverlay nullable

Browse Source
This commit is contained in:
Ryuki
2022-08-11 11:58:30 +02:00
parent d29cba80e9
commit 9b252b1d81
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,8 @@ namespace osu.Game.Rulesets.UI
public void Attach(KeysPerSecondCalculator calculator) public void Attach(KeysPerSecondCalculator calculator)
{ {
if (calculator == null) return;
var listener = new ActionListener(); var listener = new ActionListener();
KeyBindingContainer.Add(listener); KeyBindingContainer.Add(listener);

7
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -50,7 +50,8 @@ namespace osu.Game.Screens.Play
public readonly HoldForMenuButton HoldToQuit; public readonly HoldForMenuButton HoldToQuit;
public readonly PlayerSettingsOverlay PlayerSettingsOverlay; public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
private KeysPerSecondCalculator keysPerSecondCalculator; [Resolved(canBeNull: true)]
private KeysPerSecondCalculator keysPerSecondCalculator { get; set; }
public Bindable<bool> ShowHealthBar = new Bindable<bool>(true); public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
@ -130,10 +131,8 @@ namespace osu.Game.Screens.Play
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(OsuConfigManager config, INotificationOverlay notificationOverlay, KeysPerSecondCalculator calculator) private void load(OsuConfigManager config, INotificationOverlay notificationOverlay)
{ {
keysPerSecondCalculator = calculator;
if (drawableRuleset != null) if (drawableRuleset != null)
{ {
BindDrawableRuleset(drawableRuleset); BindDrawableRuleset(drawableRuleset);