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

Fix CA1854

Browse Source
This commit is contained in:
RoosterDragon
2023-03-12 17:38:38 +00:00
committed by abcdefg30
parent 56fe08cb00
commit 231bf01f18
26 changed files with 93 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/World/Locomotor.cs
View File

@@ -91,8 +91,8 @@ namespace OpenRA.Mods.Common.Traits
if (speed > 0)
{
var nodesDict = t.Value.ToDictionary();
var cost = nodesDict.ContainsKey("PathingCost")
? FieldLoader.GetValue<short>("cost", nodesDict["PathingCost"].Value)
var cost = nodesDict.TryGetValue("PathingCost", out var entry)
? FieldLoader.GetValue<short>("cost", entry.Value)
: 10000 / speed;
ret.Add(t.Key, new TerrainInfo(speed, (short)cost));
}

4
OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
View File

@@ -166,7 +166,7 @@ namespace OpenRA.Mods.Common.Traits
{
// Existing smudge; make it deeper
// A null Sequence indicates a deleted smudge.
var tile = dirty.ContainsKey(loc) && dirty[loc].Sequence != null ? dirty[loc] : tiles[loc];
var tile = dirty.TryGetValue(loc, out var d) && d.Sequence != null ? d : tiles[loc];
var maxDepth = smudges[tile.Type].Length;
if (tile.Depth < maxDepth - 1)
tile.Depth++;
@@ -180,7 +180,7 @@ namespace OpenRA.Mods.Common.Traits
if (!world.Map.Contains(loc))
return;
var tile = dirty.ContainsKey(loc) ? dirty[loc] : default;
var tile = dirty.TryGetValue(loc, out var d) ? d : default;
// Setting Sequence to null to indicate a deleted smudge.
tile.Sequence = null;