From a0ad79e555cfb1ca1f10f73b88f2221422d3a7ab Mon Sep 17 00:00:00 2001
From: Andre Mohren <andremohren@gmail.com>
Date: Sun, 22 Jul 2018 14:56:00 +0200
Subject: [PATCH] Extracted RadarUp and RadarDown notifications to RadarWidget.

---
 .../Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs            | 2 +-
 OpenRA.Mods.Common/Widgets/RadarWidget.cs                      | 3 +++
 mods/cnc/chrome/ingame.yaml                                    | 2 ++
 mods/d2k/chrome/ingame-player.yaml                             | 2 ++
 mods/ra/chrome/ingame-player.yaml                              | 2 ++
 mods/ts/chrome/ingame-player.yaml                              | 2 ++
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
index 5b1889af6a..99f7fb17f2 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					.Any(a => a.Owner == world.LocalPlayer);
 
 				if (radarEnabled != cachedRadarEnabled)
-					Game.Sound.PlayNotification(world.Map.Rules, null, "Sounds", radarEnabled ? "RadarUp" : "RadarDown", null);
+					Game.Sound.PlayNotification(world.Map.Rules, null, "Sounds", radarEnabled ? radar.SoundUp : radar.SoundDown, null);
 				cachedRadarEnabled = radarEnabled;
 			};
 
diff --git a/OpenRA.Mods.Common/Widgets/RadarWidget.cs b/OpenRA.Mods.Common/Widgets/RadarWidget.cs
index 9f80cd6fb9..335484b4d2 100644
--- a/OpenRA.Mods.Common/Widgets/RadarWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/RadarWidget.cs
@@ -59,6 +59,9 @@ namespace OpenRA.Mods.Common.Widgets
 		Sprite shroudSprite;
 		Shroud renderShroud;
 
+		public string SoundUp { get; private set; }
+		public string SoundDown { get; private set; }
+
 		[ObjectCreator.UseCtor]
 		public RadarWidget(World world, WorldRenderer worldRenderer)
 		{
diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index e05bb97100..87b5bfa275 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -618,6 +618,8 @@ Container@PLAYER_WIDGETS:
 							Width: PARENT_RIGHT - 2
 							Height: PARENT_BOTTOM - 2
 							WorldInteractionController: INTERACTION_CONTROLLER
+							SoundUp: RadarUp
+							SoundDown: RadarDown
 							Children:
 								LogicTicker@RADAR_TICKER:
 						VqaPlayer@PLAYER:
diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml
index 70dd7e2e60..fdd017317d 100644
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -376,6 +376,8 @@ Container@PLAYER_WIDGETS:
 							Y: 34
 							Width: 202
 							Height: 202
+							SoundUp: RadarUp
+							SoundDown: RadarDown
 							Children:
 						VqaPlayer@PLAYER:
 							X: 12
diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml
index e1c6630e7f..f7ebca29f8 100644
--- a/mods/ra/chrome/ingame-player.yaml
+++ b/mods/ra/chrome/ingame-player.yaml
@@ -398,6 +398,8 @@ Container@PLAYER_WIDGETS:
 							Y: 41
 							Width: 220
 							Height: 220
+							SoundUp: RadarUp
+							SoundDown: RadarDown
 							Children:
 						VqaPlayer@PLAYER:
 							X: 8
diff --git a/mods/ts/chrome/ingame-player.yaml b/mods/ts/chrome/ingame-player.yaml
index 37c2743cd8..2b70d79c7d 100644
--- a/mods/ts/chrome/ingame-player.yaml
+++ b/mods/ts/chrome/ingame-player.yaml
@@ -400,6 +400,8 @@ Container@PLAYER_WIDGETS:
 							Y: 64
 							Width: 206
 							Height: 161
+							SoundUp: RadarUp
+							SoundDown: RadarDown
 						VqaPlayer@PLAYER:
 							X: 16
 							Y: 64