From c1cbe0f0f5cb530a7b0d49e933f05f7628858acf Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 3 Dec 2011 11:28:42 +1300 Subject: [PATCH] Simplify some of the mess in RadarBinWidget --- OpenRA.Mods.RA/Widgets/RadarBinWidget.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs index e31ad67778..95c9a59132 100755 --- a/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs @@ -173,7 +173,11 @@ namespace OpenRA.Mods.RA.Widgets .Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive); if (hasRadarNew != hasRadar) + { radarAnimating = true; + var eva = Rules.Info["world"].Traits.Get(); + Sound.Play(hasRadarNew ? eva.RadarUp : eva.RadarDown); + } hasRadar = hasRadarNew; @@ -207,16 +211,6 @@ namespace OpenRA.Mods.RA.Widgets if (radarAnimationFrame <= radarSlideAnimationLength) radarOrigin = float2.Lerp(radarClosedOrigin, radarOpenOrigin, radarAnimationFrame * 1.0f / radarSlideAnimationLength); - var eva = Rules.Info["world"].Traits.Get(); - - // Play radar-on sound at the start of the activate anim (open) - if (radarAnimationFrame == radarSlideAnimationLength && hasRadar) - Sound.Play(eva.RadarUp); - - // Play radar-on sound at the start of the activate anim (close) - if (radarAnimationFrame == radarSlideAnimationLength + radarActivateAnimationLength - 1 && !hasRadar) - Sound.Play(eva.RadarDown); - // Minimap height if (radarAnimationFrame >= radarSlideAnimationLength) radarMinimapHeight = float2.Lerp(0, 1, (radarAnimationFrame - radarSlideAnimationLength) * 1.0f / radarActivateAnimationLength);