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

Remove IEquatable from ActorBoundsPair.

Browse Source
This commit is contained in:
Paul Chote
2020-02-28 21:17:51 +00:00
committed by atlimit8
parent 2b6c104011
commit 4ba50a4379
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Traits/World/ScreenMap.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Primitives;
namespace OpenRA.Traits namespace OpenRA.Traits
{ {
public struct ActorBoundsPair : IEquatable<ActorBoundsPair> public struct ActorBoundsPair
{ {
public readonly Actor Actor; public readonly Actor Actor;
@@ -27,14 +27,8 @@ namespace OpenRA.Traits
public ActorBoundsPair(Actor actor, Rectangle bounds) { Actor = actor; Bounds = bounds; } public ActorBoundsPair(Actor actor, Rectangle bounds) { Actor = actor; Bounds = bounds; }
public static bool operator ==(ActorBoundsPair me, ActorBoundsPair other) { return me.Actor == other.Actor && Equals(me.Bounds, other.Bounds); }
public static bool operator !=(ActorBoundsPair me, ActorBoundsPair other) { return !(me == other); }
public override int GetHashCode() { return Actor.GetHashCode() ^ Bounds.GetHashCode(); } public override int GetHashCode() { return Actor.GetHashCode() ^ Bounds.GetHashCode(); }
public bool Equals(ActorBoundsPair other) { return this == other; }
public override bool Equals(object obj) { return obj is ActorBoundsPair && Equals((ActorBoundsPair)obj); }
public override string ToString() { return "{0}->{1}".F(Actor.Info.Name, Bounds.GetType().Name); } public override string ToString() { return "{0}->{1}".F(Actor.Info.Name, Bounds.GetType().Name); }
} }