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

Fix Analyzer warning: V3022 Expression is always true.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-09-12 14:49:22 +02:00
committed by Paul Chote
parent e320bbfc87
commit 8d7e5f4663
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
frameContainer.IsVisible = () => (currentSprites != null && currentSprites.Length > 1) || frameContainer.IsVisible = () => (currentSprites != null && currentSprites.Length > 1) ||
(isVideoLoaded && player != null && player.Video != null && player.Video.Frames > 1); (isVideoLoaded && player != null && player.Video != null && player.Video.Frames > 1);
frameSlider = panel.Get<SliderWidget>("FRAME_SLIDER"); frameSlider = panel.GetOrNull<SliderWidget>("FRAME_SLIDER");
if (frameSlider != null) if (frameSlider != null)
{ {
frameSlider.OnChange += x => frameSlider.OnChange += x =>
@@ -183,7 +183,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
player.Stop(); player.Stop();
else else
{ {
if (frameSlider != null)
frameSlider.Value = 0; frameSlider.Value = 0;
currentFrame = 0; currentFrame = 0;
animateFrames = false; animateFrames = false;
} }
@@ -336,16 +338,24 @@ namespace OpenRA.Mods.Common.Widgets.Logic
player.Load(prefix + filename); player.Load(prefix + filename);
player.DrawOverlay = false; player.DrawOverlay = false;
isVideoLoaded = true; isVideoLoaded = true;
if (frameSlider != null)
{
frameSlider.MaximumValue = (float)player.Video.Frames - 1; frameSlider.MaximumValue = (float)player.Video.Frames - 1;
frameSlider.Ticks = 0; frameSlider.Ticks = 0;
}
return true; return true;
} }
currentSprites = world.Map.Rules.Sequences.SpriteCache[prefix + filename]; currentSprites = world.Map.Rules.Sequences.SpriteCache[prefix + filename];
currentFrame = 0; currentFrame = 0;
if (frameSlider != null)
{
frameSlider.MaximumValue = (float)currentSprites.Length - 1; frameSlider.MaximumValue = (float)currentSprites.Length - 1;
frameSlider.Ticks = currentSprites.Length; frameSlider.Ticks = currentSprites.Length;
} }
}
catch (Exception ex) catch (Exception ex)
{ {
isLoadError = true; isLoadError = true;

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
showScreenMapCheckbox.OnClick = () => debugVis.ScreenMap ^= true; showScreenMapCheckbox.OnClick = () => debugVis.ScreenMap ^= true;
} }
var terrainGeometryTrait = world.WorldActor.Trait<TerrainGeometryOverlay>(); var terrainGeometryTrait = world.WorldActor.TraitOrDefault<TerrainGeometryOverlay>();
var showTerrainGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_TERRAIN_OVERLAY"); var showTerrainGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_TERRAIN_OVERLAY");
if (showTerrainGeometryCheckbox != null && terrainGeometryTrait != null) if (showTerrainGeometryCheckbox != null && terrainGeometryTrait != null)
{ {