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

Use StringComparison.Ordinal for StartsWith checks in TechTree.cs.

Browse Source
This commit is contained in:
RoosterDragon
2017-12-16 16:12:00 +00:00
committed by reaperrr
parent 13edaefcac
commit bf21fc5213
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Player/TechTree.cs
View File

@@ -9,6 +9,7 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Primitives; using OpenRA.Primitives;
@@ -66,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits
public bool HasPrerequisites(IEnumerable<string> prerequisites) public bool HasPrerequisites(IEnumerable<string> prerequisites)
{ {
var ownedPrereqs = GatherOwnedPrerequisites(player); var ownedPrereqs = GatherOwnedPrerequisites(player);
return prerequisites.All(p => !(p.Replace("~", "").StartsWith("!") return prerequisites.All(p => !(p.Replace("~", "").StartsWith("!", StringComparison.Ordinal)
^ !ownedPrereqs.ContainsKey(p.Replace("!", "").Replace("~", "")))); ^ !ownedPrereqs.ContainsKey(p.Replace("!", "").Replace("~", ""))));
} }
@@ -134,7 +135,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var prereq in prerequisites) foreach (var prereq in prerequisites)
{ {
var withoutTilde = prereq.Replace("~", ""); var withoutTilde = prereq.Replace("~", "");
if (withoutTilde.StartsWith("!") ^ !ownedPrerequisites.ContainsKey(withoutTilde.Replace("!", ""))) if (withoutTilde.StartsWith("!", StringComparison.Ordinal) ^ !ownedPrerequisites.ContainsKey(withoutTilde.Replace("!", "")))
return false; return false;
} }
@@ -146,10 +147,10 @@ namespace OpenRA.Mods.Common.Traits
// PERF: Avoid LINQ. // PERF: Avoid LINQ.
foreach (var prereq in prerequisites) foreach (var prereq in prerequisites)
{ {
if (!prereq.StartsWith("~")) if (!prereq.StartsWith("~", StringComparison.Ordinal))
continue; continue;
var withoutTilde = prereq.Replace("~", ""); var withoutTilde = prereq.Replace("~", "");
if (withoutTilde.StartsWith("!") ^ !ownedPrerequisites.ContainsKey(withoutTilde.Replace("!", ""))) if (withoutTilde.StartsWith("!", StringComparison.Ordinal) ^ !ownedPrerequisites.ContainsKey(withoutTilde.Replace("!", "")))
return true; return true;
} }