diff --git a/GoRogue-PerformanceTests/GoRogue-PerformanceTests.csproj b/GoRogue-PerformanceTests/GoRogue-PerformanceTests.csproj index 60dc54c2..9b70b284 100644 --- a/GoRogue-PerformanceTests/GoRogue-PerformanceTests.csproj +++ b/GoRogue-PerformanceTests/GoRogue-PerformanceTests.csproj @@ -38,8 +38,8 @@ ..\packages\EasyConsole.1.1.0\lib\net452\EasyConsole.dll - - ..\packages\OptimizedPriorityQueue.4.1.1\lib\net45\Priority Queue.dll + + ..\packages\OptimizedPriorityQueue.4.2.0\lib\net45\Priority Queue.dll diff --git a/GoRogue-PerformanceTests/packages.config b/GoRogue-PerformanceTests/packages.config index 0e8afd85..ef7fb895 100644 --- a/GoRogue-PerformanceTests/packages.config +++ b/GoRogue-PerformanceTests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/GoRogue/Coord.cs b/GoRogue/Coord.cs index 6aa37ce0..5411ef2f 100644 --- a/GoRogue/Coord.cs +++ b/GoRogue/Coord.cs @@ -29,8 +29,7 @@ namespace GoRogue /// Coord where possible, as something that accepts or works with Coord will generally work with other supported types /// as well. /// - public struct Coord : IEquatable, IEquatable, IEquatable, IEquatable, IEquatable, IEquatable, - IEquatable<(int x, int y)> + public struct Coord : IEquatable, IEquatable<(int x, int y)> { /// /// Coord value that represents None or no position (since Coord is not a nullable type). @@ -485,13 +484,6 @@ public override int GetHashCode() /// True if either the x-values or y-values are not equal, false if they are both equal. /// public static bool operator !=(MonoPoint p1, Coord c2) => !(p1 == c2); - - /// - /// True if the given coordinate has equal x and y values to the current one. - /// - /// Point to compare. - /// True if the two coordinates are equal, false if not. - public bool Equals(MonoPoint other) => X == other.X && Y == other.Y; #endregion #region System.Drawing Compatibility @@ -662,13 +654,6 @@ public override int GetHashCode() /// public static bool operator !=(DrawingPoint p1, Coord c2) => !(p1 == c2); - /// - /// True if the given coordinate has equal x and y values to the current one. - /// - /// Point to compare. - /// True if the two coordinates are equal, false if not. - public bool Equals(DrawingPoint other) => X == other.X && Y == other.Y; - /// /// True if the two point's X and Y values are equal. /// @@ -711,13 +696,6 @@ public override int GetHashCode() /// public static bool operator !=(PointF p1, Coord c2) => !(p1 == c2); - /// - /// True if the given coordinate has equal x and y values to the current one. - /// - /// Point to compare. - /// True if the two coordinates are equal, false if not. - public bool Equals(PointF other) => X == other.X && Y == other.Y; - /// /// True if the point's x/y values equal the size's width/height values. /// @@ -760,13 +738,6 @@ public override int GetHashCode() /// public static bool operator !=(Size size, Coord c) => !(size == c); - /// - /// True if the current coordinate has equal x and y values to the given size's Width/Height values. - /// - /// Size to compare. - /// True if the size and coordinate are equivalent, false if not. - public bool Equals(Size other) => X == other.Width && Y == other.Height; - /// /// True if the point's x/y values equal the size's width/height values. /// @@ -808,13 +779,6 @@ public override int GetHashCode() /// True if either the Width/x values or the Height/y values are not equal, false if they are both equal. /// public static bool operator !=(SizeF size, Coord c) => !(size == c); - - /// - /// True if the current coordinate has equal x and y values to the given size's Width/Height values. - /// - /// SizeF to compare. - /// True if the size and coordinate are equivalent, false if not. - public bool Equals(SizeF other) => X == other.Width && Y == other.Height; #endregion #region TupleCompatibility diff --git a/GoRogue/GoRogue.csproj b/GoRogue/GoRogue.csproj index f2c1e4e4..f0ec6330 100644 --- a/GoRogue/GoRogue.csproj +++ b/GoRogue/GoRogue.csproj @@ -2,13 +2,13 @@ netstandard2.0 GoRogue - 2.1.0 + 2.1.1 Christopher Ridley Roguelike/2D game utility library. MIT https://github.com/Chris3606/GoRogue false - See https://github.com/Chris3606/GoRogue/releases/tag/2.1.0 for details. + HOTFIX: See https://github.com/Chris3606/GoRogue/releases/tag/2.1.1 for details. Copyright 2019 Christopher Ridley. All rights reserved. roguelike roguelikes rogue library 2d game games diff --git a/GoRogue/Rectangle.cs b/GoRogue/Rectangle.cs index 6050a433..80b9571e 100644 --- a/GoRogue/Rectangle.cs +++ b/GoRogue/Rectangle.cs @@ -20,8 +20,7 @@ namespace GoRogue /// Rectangle where possible, as something that accepts or works with Rectangle will generally work with other supported types /// as well. /// - public struct Rectangle : IEquatable, IEquatable, IEquatable, IEquatable, - IEquatable<(int x, int y, int width, int height)> + public struct Rectangle : IEquatable, IEquatable<(int x, int y, int width, int height)> { /// /// The empty rectangle. Has origin of (0, 0) with 0 width and height. @@ -826,13 +825,6 @@ public Rectangle TranslateY(int dy) /// True if any of the x/y/width/height values are not equal, false if they are all equal. /// public static bool operator !=(XnaRectangle r1, Rectangle r2) => !(r1 == r2); - - /// - /// True if the given position has equal x and y values to the current one. - /// - /// Point to compare. - /// True if the two positions are equal, false if not. - public bool Equals(XnaRectangle other) => X == other.X && Y == other.Y && Width == other.Width && Height == other.Height; #endregion #region System Drawing Conversions @@ -898,13 +890,6 @@ public Rectangle TranslateY(int dy) /// public static bool operator !=(DrawingRectangle r1, Rectangle r2) => !(r1 == r2); - /// - /// True if the given position has equal x and y values to the current one. - /// - /// Point to compare. - /// True if the two positions are equal, false if not. - public bool Equals(DrawingRectangle other) => X == other.X && Y == other.Y && Width == other.Width && Height == other.Height; - /// /// True if the two rectangles represent the same area. /// @@ -946,13 +931,6 @@ public Rectangle TranslateY(int dy) /// True if any of the x/y/width/height values are not equal, false if they are all equal. /// public static bool operator !=(DrawingRectangleF r1, Rectangle r2) => !(r1 == r2); - - /// - /// True if the given position has equal x and y values to the current one. - /// - /// Point to compare. - /// True if the two positions are equal, false if not. - public bool Equals(DrawingRectangleF other) => X == other.X && Y == other.Y && Width == other.Width && Height == other.Height; #endregion #region Tuple Compability