This commit is contained in:
Chris Forbes
2010-04-28 10:52:52 +12:00
parent ffa6ede648
commit f57986030b

View File

@@ -98,12 +98,9 @@ namespace OpenRA.Widgets
radarMinimapHeight = float2.Lerp(0, 192, (radarAnimationFrame - radarSlideAnimationLength) * 1.0f / radarActivateAnimationLength); radarMinimapHeight = float2.Lerp(0, 192, (radarAnimationFrame - radarSlideAnimationLength) * 1.0f / radarActivateAnimationLength);
// Animation is complete // Animation is complete
if ((radarAnimationFrame == 0 && !hasRadar) if (radarAnimationFrame == (hasRadar ? radarSlideAnimationLength : 0))
|| (radarAnimationFrame == radarSlideAnimationLength + radarActivateAnimationLength && hasRadar))
{
radarAnimating = false; radarAnimating = false;
} }
}
void DrawRadar(World world) void DrawRadar(World world)
{ {
@@ -114,9 +111,7 @@ namespace OpenRA.Widgets
.Any(a => a.Trait.IsActive); .Any(a => a.Trait.IsActive);
if (hasNewRadar != hasRadar) if (hasNewRadar != hasRadar)
{
radarAnimating = true; radarAnimating = true;
}
hasRadar = hasNewRadar; hasRadar = hasNewRadar;