h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 13:37:25 +08:00
Code Issues Releases Wiki Activity

Use new generic-error sample in appropriate places

Browse Source
This commit is contained in:
Jamie Taylor 2023-10-13 21:06:50 +09:00
parent 6358a5e210
commit d97b618d02
No known key found for this signature in database
GPG Key ID: 2ACFA8B6370B8C8C
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
View File

@ -40,6 +40,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo; private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
protected override string PopInSampleName => @"UI/generic-error";
public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo) public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
{ {
this.conflictInfo = conflictInfo; this.conflictInfo = conflictInfo;

2
osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
View File

@ -239,7 +239,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
} }
}; };
sampleJoinFail = audio.Samples.Get(@"UI/password-fail"); sampleJoinFail = audio.Samples.Get(@"UI/generic-error");
joinButton.Action = performJoin; joinButton.Action = performJoin;
} }