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

7
OpenRA.FileFormats/HSLColor.cs
View File

@@ -95,11 +95,8 @@ namespace OpenRA.FileFormats
public override bool Equals(object obj)
{
if (obj == null)
return false;
HSLColor o = (HSLColor)obj;
return o == this;
var o = obj as HSLColor?;
return o != null && o == this;
}
}
}

6
OpenRA.FileFormats/Hotkey.cs
View File

@@ -72,10 +72,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
return (Hotkey)obj == this;
var o = obj as Hotkey?;
return o != null && o == this;
}
public override string ToString() { return "{0} {1}".F(Key, Modifiers.ToString("F")); }

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);

7
OpenRA.FileFormats/WAngle.cs
View File

@@ -40,11 +40,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
WAngle o = (WAngle)obj;
return o == this;
var o = obj as WAngle?;
return o != null && o == this;
}
public int Sin() { return new WAngle(Angle - 256).Cos(); }

7
OpenRA.FileFormats/WPos.cs
View File

@@ -56,11 +56,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
WPos o = (WPos)obj;
return o == this;
var o = obj as WPos?;
return o != null && o == this;
}
public override string ToString() { return "{0},{1},{2}".F(X, Y, Z); }

7
OpenRA.FileFormats/WRange.cs
View File

@@ -80,11 +80,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
WRange o = (WRange)obj;
return o == this;
var o = obj as WRange?;
return o != null && o == this;
}
public override string ToString() { return "{0}".F(Range); }

7
OpenRA.FileFormats/WRot.cs
View File

@@ -97,11 +97,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
WRot o = (WRot)obj;
return o == this;
var o = obj as WRot?;
return o != null && o == this;
}
public override string ToString() { return "{0},{1},{2}".F(Roll, Pitch, Yaw); }

7
OpenRA.FileFormats/WVec.cs
View File

@@ -83,11 +83,8 @@ namespace OpenRA
public override bool Equals(object obj)
{
if (obj == null)
return false;
WVec o = (WVec)obj;
return o == this;
var o = obj as WVec?;
return o != null && o == this;
}
public override string ToString() { return "{0},{1},{2}".F(X, Y, Z); }