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

Mute shellmap combat

Browse Source
This commit is contained in:
Paul Chote
2010-10-14 20:03:36 +13:00
parent 9c944924de
commit 4bdf675def
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Sound.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA
return;
var sound = sounds[name];
soundEngine.Play2D(sound, false, true, float2.Zero, SoundVolume);
soundEngine.Play2D(sound, false, true, float2.Zero, InternalSoundVolume);
}
public static void Play(string name, float2 pos)
@@ -63,7 +63,7 @@ namespace OpenRA
return;
var sound = sounds[name];
soundEngine.Play2D(sound, false, false, pos, SoundVolume);
soundEngine.Play2D(sound, false, false, pos, InternalSoundVolume);
}
public static void PlayToPlayer(Player player, string name)
@@ -81,7 +81,7 @@ namespace OpenRA
public static void PlayVideo(byte[] raw)
{
rawSource = LoadSoundRaw(raw);
video = soundEngine.Play2D(rawSource, false, true, float2.Zero, SoundVolume);
video = soundEngine.Play2D(rawSource, false, true, float2.Zero, InternalSoundVolume);
}
public static void PlayVideo()
@@ -171,13 +171,25 @@ namespace OpenRA
set { soundEngine.Volume = value;}
}
static float soundVolumeModifier = 1.0f;
public static float SoundVolumeModifier
{
get { return soundVolumeModifier; }
set
{
soundVolumeModifier = value;
soundEngine.SetSoundVolume(InternalSoundVolume, music, video);
}
}
static float InternalSoundVolume { get { return SoundVolume*soundVolumeModifier; } }
public static float SoundVolume
{
get { return Game.Settings.Sound.SoundVolume; }
set
{
Game.Settings.Sound.SoundVolume = value;
soundEngine.SetSoundVolume(value, music, video);
soundEngine.SetSoundVolume(InternalSoundVolume, music, video);
}
}