Unstable 0.1300.0.5

2021-04-01 16:09:18 +03:00
parent 862221635c
commit 96b2184811
54 changed files with 429 additions and 122 deletions
@@ -8,7 +8,18 @@ namespace Barotrauma.Networking
 {
    public enum ChatMessageType
    {
-        Default, Error, Dead, Server, Radio, Private, Console, MessageBox, Order, ServerLog, ServerMessageBox, ServerMessageBoxInGame
+        Default = 0,
+        Error = 1,
+        Dead = 2,
+        Server = 3,
+        Radio = 4,
+        Private = 5,
+        Console = 6,
+        MessageBox = 7,
+        Order = 8,
+        ServerLog = 9,
+        ServerMessageBox = 10,
+        ServerMessageBoxInGame = 11
    }

    public enum PlayerConnectionChangeType { None = 0, Joined = 1, Kicked = 2, Disconnected = 3, Banned = 4 }
@@ -173,7 +173,7 @@ namespace Barotrauma.Networking
 #endif
        
        protected ServerSettings serverSettings;
-        
+
        protected TimeSpan updateInterval;
        protected DateTime updateTimer;

@@ -55,6 +55,14 @@ namespace Barotrauma.Networking

        public State CurrentState { get; private set; }

+        public bool UseRespawnPrompt
+        {
+            get
+            {
+                return GameMain.GameSession?.GameMode is CampaignMode && Level.Loaded != null && Level.Loaded?.Type != LevelData.LevelType.Outpost;
+            }
+        }
+
        private float maxTransportTime;

        private float updateReturnTimer;