From 4ba50a4379c43b229bf115db693f58b0299a291c Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 28 Feb 2020 21:17:51 +0000 Subject: [PATCH] Remove IEquatable from ActorBoundsPair. --- OpenRA.Game/Traits/World/ScreenMap.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/OpenRA.Game/Traits/World/ScreenMap.cs b/OpenRA.Game/Traits/World/ScreenMap.cs index 0370c14237..7f6465fffd 100644 --- a/OpenRA.Game/Traits/World/ScreenMap.cs +++ b/OpenRA.Game/Traits/World/ScreenMap.cs @@ -18,7 +18,7 @@ using OpenRA.Primitives; namespace OpenRA.Traits { - public struct ActorBoundsPair : IEquatable + public struct ActorBoundsPair { public readonly Actor Actor; @@ -27,14 +27,8 @@ namespace OpenRA.Traits 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 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); } }