Removes the MapMusic checkbox.

OpenRA.Game/Settings.cs

@@ -108,7 +108,6 @@ namespace OpenRA
 
 		public bool Shuffle = false;
 		public bool Repeat = false;
-		public bool MapMusic = true;
 
 		public string Engine = "AL";
 		public string Device = null;

OpenRA.Game/Traits/World/MusicPlaylist.cs

@@ -44,8 +44,7 @@ namespace OpenRA.Traits
 
 			random = playlist.Shuffle(Game.CosmeticRandom).ToArray();
 
-			if (Game.Settings.Sound.MapMusic
-				&& !string.IsNullOrEmpty(info.StartingMusic)
+			if (!string.IsNullOrEmpty(info.StartingMusic)
 				&& world.Map.Rules.Music.ContainsKey(info.StartingMusic)
 				&& world.Map.Rules.Music[info.StartingMusic].Exists)
 			{

OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs

@@ -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]

OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs

@@ -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;

mods/cnc/chrome/settings.yaml

@@ -238,13 +238,6 @@ Container@SETTINGS_PANEL:
 							Font: Bold
 							Text: Audio
 							Align: Center
-						Checkbox@SHELLMAP_MUSIC:
-							X: 15
-							Y: 40
-							Width: 200
-							Height: 20
-							Font: Regular
-							Text: Shellmap / Mission Music
 						Label@SOUND_LABEL:
 							X: PARENT_RIGHT - WIDTH - 270
 							Y: 37
@@ -260,7 +253,7 @@ Container@SETTINGS_PANEL:
 							Ticks: 5
 						Checkbox@CASH_TICKS:
 							X: 15
-							Y: 70
+							Y: 40
 							Width: 200
 							Height: 20
 							Font: Regular

mods/ra/chrome/settings.yaml

@@ -246,13 +246,6 @@ Background@SETTINGS_PANEL:
 			Width: PARENT_RIGHT - 10
 			Height: PARENT_BOTTOM
 			Children:
-				Checkbox@SHELLMAP_MUSIC:
-					X: 15
-					Y: 40
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Shellmap / Mission Music
 				Label@SOUND_LABEL:
 					X: PARENT_RIGHT - WIDTH - 270
 					Y: 37
@@ -268,7 +261,7 @@ Background@SETTINGS_PANEL:
 					Ticks: 5
 				Checkbox@CASH_TICKS:
 					X: 15
-					Y: 70
+					Y: 40
 					Width: 200
 					Height: 20
 					Font: Regular