Merge pull request #25113 from nekodex/generic-error-sfx

peppy · web-flow · commit 54722bf25107 · 2023-10-14T04:35:12.000+09:00
Use new `generic-error` sample in appropriate places
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -40,6 +40,8 @@ public partial class KeyBindingConflictPopover : OsuPopover
 
         private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
 
+        protected override string PopInSampleName => @"UI/generic-error";
+
         public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
         {
             this.conflictInfo = conflictInfo;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -239,7 +239,7 @@ private void load(OsuColour colours, AudioManager audio)
                     }
                 };
 
-                sampleJoinFail = audio.Samples.Get(@"UI/password-fail");
+                sampleJoinFail = audio.Samples.Get(@"UI/generic-error");
 
                 joinButton.Action = performJoin;
             }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1014.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ public partial class KeyBindingConflictPopover : OsuPopover`
`40`	`40`
`41`	`41`	`private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;`
`42`	`42`
	`43`	`+ protected override string PopInSampleName => @"UI/generic-error";`
	`44`	`+`
`43`	`45`	`public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)`
`44`	`46`	`{`
`45`	`47`	`this.conflictInfo = conflictInfo;`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ private void load(OsuColour colours, AudioManager audio)`
`239`	`239`	`}`
`240`	`240`	`};`
`241`	`241`
`242`		`- sampleJoinFail = audio.Samples.Get(@"UI/password-fail");`
	`242`	`+ sampleJoinFail = audio.Samples.Get(@"UI/generic-error");`
`243`	`243`
`244`	`244`	`joinButton.Action = performJoin;`
`245`	`245`	`}`