From 56675a61f5d4eb86ac79aad6de0c2fe35141abfc Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 6 Nov 2010 16:43:18 +1300
Subject: [PATCH] rationalize the mess of Sound.Play[ToPlayer] functions.

---
 OpenRA.Game/Sound.cs | 49 ++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/OpenRA.Game/Sound.cs b/OpenRA.Game/Sound.cs
index 7e2be8c17e..6eb0cc1994 100644
--- a/OpenRA.Game/Sound.cs
+++ b/OpenRA.Game/Sound.cs
@@ -48,48 +48,25 @@ namespace OpenRA
 
 		public static void SetListenerPosition(float2 position) { soundEngine.SetListenerPosition(position); }
 
-		public static ISound Play(string name)
-		{
-			return Play(name, float2.Zero);
-		}
-
-		public static ISound Play(string name, float2 pos)
+		static ISound Play(Player player, string name, bool headRelative, float2 pos, float volumeModifier)
 		{
+			if (player != null && player != player.World.LocalPlayer)
+				return null;
 			if (name == "" || name == null)
 				return null;
 
-			var sound = sounds[name];
-			return soundEngine.Play2D(sound, false, false, pos, InternalSoundVolume);
-		}
-
-
-		public static ISound Play(string name, float volumeModifier)
-		{
-			return Play(name, float2.Zero, volumeModifier);
-		}
-
-		public static ISound Play(string name, float2 pos, float volumeModifier)
-		{
-			if (name == "" || name == null)
-				return null;
-
-			var sound = sounds[name];
-			return soundEngine.Play2D(sound, false, false, pos, InternalSoundVolume * volumeModifier);
-		}
-
-		public static ISound PlayToPlayer(Player player, string name)
-		{
-			return PlayToPlayer(player, name, float2.Zero);
-		}
-
-		public static ISound PlayToPlayer(Player player, string name, float2 pos)
-		{
-			if (player == player.World.LocalPlayer)
-				return Play(name, pos);
-
-			return null;
+			return soundEngine.Play2D(sounds[name],
+				false, headRelative, pos,
+				InternalSoundVolume * volumeModifier);
 		}
 
+		public static ISound Play(string name) { return Play(null, name, true, float2.Zero, 1); }
+		public static ISound Play(string name, float2 pos) { return Play(null, name, false, pos, 1); }
+		public static ISound Play(string name, float volumeModifier) { return Play(null, name, true, float2.Zero, volumeModifier); }
+		public static ISound Play(string name, float2 pos, float volumeModifier) { return Play(null, name, false, pos, volumeModifier); }
+		public static ISound PlayToPlayer(Player player, string name) { return Play( player, name, true, float2.Zero, 1); }
+		public static ISound PlayToPlayer(Player player, string name, float2 pos) { return Play(player, name, false, pos, 1); }
+		
 		public static void PlayVideo(byte[] raw)
 		{
 			rawSource = LoadSoundRaw(raw);