Unstable 0.1400.0.0

2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -1,6 +1,4 @@
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using System;
+using System;

 namespace Barotrauma.Networking
 {
@@ -8,6 +6,17 @@ namespace Barotrauma.Networking
    {
        private DateTime lastShuttleLeavingWarningTime;

+        public int PendingRespawnCount
+
+        {
+            get; private set;
+        }
+
+        public int RequiredRespawnCount
+        {
+            get; private set;
+        }
+
        partial void UpdateTransportingProjSpecific(float deltaTime)
        {
            if (GameMain.Client?.Character == null || GameMain.Client.Character.Submarine != RespawnShuttle) { return; }
@@ -41,6 +50,8 @@ namespace Barotrauma.Networking
                    }
                    break;
                case State.Waiting:
+                    PendingRespawnCount = msg.ReadUInt16();
+                    RequiredRespawnCount = msg.ReadUInt16();
                    RespawnCountdownStarted = msg.ReadBoolean();
                    ResetShuttle();
                    float newRespawnTime = msg.ReadSingle();