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

Rewrite our Equals implementations so they don't crash when comparing incompatible objects

Browse Source
This commit is contained in:
ScottNZ
2013-11-12 17:12:00 +13:00
parent 4f91c22fed
commit c373bc22e8
12 changed files with 24 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.FileFormats/Primitives/Pair.cs
View File

@@ -40,10 +40,8 @@ namespace OpenRA.FileFormats
public override bool Equals(object obj)
{
if (!(obj is Pair<T, U>))
return false;
return (Pair<T, U>)obj == this;
var o = obj as Pair<T, U>?;
return o != null && o == this;
}
public override int GetHashCode()

7
OpenRA.FileFormats/Primitives/float2.cs
View File

@@ -73,11 +73,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
float2 o = (float2)obj;
return o == this;
var o = obj as float2?;
return o != null && o == this;
}
public static readonly float2 Zero = new float2(0, 0);

7
OpenRA.FileFormats/Primitives/int2.cs
View File

@@ -43,11 +43,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
int2 o = (int2)obj;
return o == this;
var o = obj as int2?;
return o != null && o == this;
}
public static readonly int2 Zero = new int2(0, 0);