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

Removes the MapMusic checkbox.

Browse Source
This commit is contained in:
Zimmermann Gyula
2015-07-12 13:44:56 +02:00
parent e875f675b8
commit 32c29e7dd6
6 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Play track defined in music.yaml or keep it empty for a random song.")]
public void PlayMusic(string track = null, LuaFunction func = null)
{
if (!Game.Settings.Sound.MapMusic || !playlist.IsMusicAvailable)
if (!playlist.IsMusicAvailable)
return;
var musicInfo = !string.IsNullOrEmpty(track) ? world.Map.Rules.Music[track]

2
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -263,7 +263,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
var ss = Game.Settings.Sound;
BindCheckboxPref(panel, "SHELLMAP_MUSIC", ss, "MapMusic");
BindCheckboxPref(panel, "CASH_TICKS", ss, "CashTicks");
BindSliderPref(panel, "SOUND_VOLUME", ss, "SoundVolume");
@@ -295,7 +294,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var dss = new SoundSettings();
return () =>
{
ss.MapMusic = dss.MapMusic;
ss.SoundVolume = dss.SoundVolume;
ss.MusicVolume = dss.MusicVolume;
ss.VideoVolume = dss.VideoVolume;