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

Simplify some of the mess in RadarBinWidget

Browse Source
This commit is contained in:
Chris Forbes
2011-12-03 11:28:42 +13:00
parent a566a372f5
commit c1cbe0f0f5
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Widgets/RadarBinWidget.cs
View File

@@ -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<EvaAlertsInfo>();
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<EvaAlertsInfo>();
// 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);