(f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-08 19:17:50 +03:00
parent 5a9b681c13
commit 71d546ff7f
7 changed files with 115 additions and 69 deletions
@@ -86,6 +86,25 @@ namespace Barotrauma
        }

        public override bool Equals(object obj)
+        {
+            if (obj is KeyOrMouse keyOrMouse )
+            {
+                if (MouseButton.HasValue)
+                {
+                    return keyOrMouse.MouseButton.HasValue && keyOrMouse.MouseButton.Value == MouseButton.Value;
+                }
+                else
+                {
+                    return keyOrMouse.Key.Equals(Key);
+                }
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public override string ToString()
        {
            switch (MouseButton)
            {
@@ -133,7 +152,6 @@ namespace Barotrauma
        {
            get { return binding; }
        }
-#endif

        public void SetState()
        {