diff --git a/osu.Android.props b/osu.Android.props
index 7378450c38..d4331a5e65 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
-
+
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/TeamDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/TeamDisplay.cs
index 351b9b3673..833fbd6605 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/TeamDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/TeamDisplay.cs
@@ -3,6 +3,8 @@
using System.Linq;
using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
@@ -22,6 +24,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
private Drawable box;
+ private Sample sampleTeamSwap;
+
[Resolved]
private OsuColour colours { get; set; }
@@ -39,7 +43,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
}
[BackgroundDependencyLoader]
- private void load()
+ private void load(AudioManager audio)
{
box = new Container
{
@@ -72,6 +76,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
{
InternalChild = box;
}
+
+ sampleTeamSwap = audio.Samples.Get(@"Multiplayer/team-swap");
}
private void changeTeam()
@@ -99,6 +105,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
if (newTeam == displayedTeam)
return;
+ // only play the sample if an already valid team changes to another valid team.
+ // this avoids playing a sound for each user if the match type is changed to/from a team mode.
+ if (newTeam != null && displayedTeam != null)
+ sampleTeamSwap?.Play();
+
displayedTeam = newTeam;
if (displayedTeam != null)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d80dd075ee..941656bb70 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 8ce757974e..73e0030114 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
-
+