epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rationalize the mess of Sound.Play[ToPlayer] functions.

Browse Source
This commit is contained in:
Chris Forbes
2010-11-06 16:43:18 +13:00
parent 3dd27fcb77
commit 56675a61f5
1 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
OpenRA.Game/Sound.cs
View File

@@ -48,47 +48,24 @@ namespace OpenRA
public static void SetListenerPosition(float2 position) { soundEngine.SetListenerPosition(position); } public static void SetListenerPosition(float2 position) { soundEngine.SetListenerPosition(position); }
public static ISound Play(string name) static ISound Play(Player player, string name, bool headRelative, float2 pos, float volumeModifier)
{
return Play(name, float2.Zero);
}
public static ISound Play(string name, float2 pos)
{ {
if (player != null && player != player.World.LocalPlayer)
return null;
if (name == "" || name == null) if (name == "" || name == null)
return null; return null;
var sound = sounds[name]; return soundEngine.Play2D(sounds[name],
return soundEngine.Play2D(sound, false, false, pos, InternalSoundVolume); 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, float volumeModifier) 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); }
return Play(name, 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 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;
}
public static void PlayVideo(byte[] raw) public static void PlayVideo(byte[] raw)
{ {