RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-21 13:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use nullable doubule to better represent initial playback case

Browse Source
This commit is contained in:
Dean Herbert 2021-01-08 14:05:22 +09:00
parent 8f52a83b29
commit 11801d61c1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Configuration/SessionStatics.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Configuration
{ {
Set(Static.LoginOverlayDisplayed, false); Set(Static.LoginOverlayDisplayed, false);
Set(Static.MutedAudioNotificationShownOnce, false); Set(Static.MutedAudioNotificationShownOnce, false);
Set(Static.LastHoverSoundPlaybackTime, 0.0); Set(Static.LastHoverSoundPlaybackTime, (double?)0.0);
Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null); Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
} }
} }

6
osu.Game/Graphics/UserInterface/HoverSounds.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
protected readonly HoverSampleSet SampleSet; protected readonly HoverSampleSet SampleSet;
private Bindable<double> lastPlaybackTime; private Bindable<double?> lastPlaybackTime;
public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal) public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
{ {
@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, SessionStatics statics) private void load(AudioManager audio, SessionStatics statics)
{ {
lastPlaybackTime = statics.GetBindable<double>(Static.LastHoverSoundPlaybackTime); lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}"); sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
} }
@ -48,7 +48,7 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
bool requiresDebounce = HoverDebounceTime <= 0; bool requiresDebounce = HoverDebounceTime <= 0;
bool enoughTimePassedSinceLastPlayback = lastPlaybackTime.Value == 0 || Time.Current - lastPlaybackTime.Value > HoverDebounceTime; bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
if (!requiresDebounce || enoughTimePassedSinceLastPlayback) if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
{ {