Unstable 0.1400.1.0

2021-05-20 16:12:54 +03:00
parent 92f0264af2
commit 5bc850cddb
181 changed files with 2475 additions and 1588 deletions
@@ -55,6 +55,12 @@ namespace Barotrauma
        {
            Debug.Assert(actionInstance == null || actionId == null);

+            if (GUI.InputBlockingMenuOpen)
+            {
+                if (actionId.HasValue) { SendIgnore(actionId.Value); }
+                return;
+            }
+
            shouldFadeToBlack = fadeToBlack;

            if (lastMessageBox != null && !lastMessageBox.Closed && GUIMessageBox.MessageBoxes.Contains(lastMessageBox))
@@ -368,6 +374,15 @@ namespace Barotrauma
            GameMain.Client?.ClientPeer?.Send(outmsg, DeliveryMethod.Reliable);
        }

+        private static void SendIgnore(UInt16 actionId)
+        {
+            IWriteMessage outmsg = new WriteOnlyMessage();
+            outmsg.Write((byte)ClientPacketHeader.EVENTMANAGER_RESPONSE);
+            outmsg.Write(actionId);
+            outmsg.Write(byte.MaxValue);
+            GameMain.Client?.ClientPeer?.Send(outmsg, DeliveryMethod.Reliable);
+        }
+
        // Too broken, left it here if I ever want to come back to it
        private static List<RichTextData> GetQuoteHighlights(string text, Color color)
        {