(2da6c898b) Added 'pretty' merge script

2019-03-25 10:57:38 -03:00
parent 94c1b29beb
commit 991639709c
5 changed files with 224 additions and 24 deletions
@@ -1,13 +1,14 @@
 using Barotrauma.Networking;
 using Barotrauma.Particles;
 using Barotrauma.Sounds;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using System;
 using System.Collections.Generic;
+using Microsoft.Xna.Framework.Input;
 using System.Linq;
+using Lidgren.Network;

 namespace Barotrauma
 {
@@ -18,8 +19,6 @@ namespace Barotrauma
        private List<Decal> decals = new List<Decal>();

        private float serverUpdateDelay;
-        private float remoteWaterVolume, remoteOxygenPercentage;
-        private List<Vector3> remoteFireSources;

        private bool networkUpdatePending;
        private float networkUpdateTimer;
@@ -140,10 +139,6 @@ namespace Barotrauma
        partial void UpdateProjSpecific(float deltaTime, Camera cam)
        {
            serverUpdateDelay -= deltaTime;
-            if (serverUpdateDelay <= 0.0f)
-            {
-                ApplyRemoteState();
-            }

            if (networkUpdatePending)
            {
@@ -552,18 +547,18 @@ namespace Barotrauma

        public void ClientRead(ServerNetObject type, NetBuffer message, float sendingTime)
        {
-            remoteWaterVolume = message.ReadRangedSingle(0.0f, 1.5f, 8) * Volume;
-            remoteOxygenPercentage = message.ReadRangedSingle(0.0f, 100.0f, 8);
+            float newWaterVolume = message.ReadRangedSingle(0.0f, 1.5f, 8) * Volume;
+            float newOxygenPercentage = message.ReadRangedSingle(0.0f, 100.0f, 8);

            bool hasFireSources = message.ReadBoolean();
            int fireSourceCount = 0;
-            remoteFireSources = new List<Vector3>();
+            List<Vector3> newFireSources = new List<Vector3>();
            if (hasFireSources)
            {
                fireSourceCount = message.ReadRangedInteger(0, 16);
                for (int i = 0; i < fireSourceCount; i++)
                {
-                    remoteFireSources.Add(new Vector3(
+                    newFireSources.Add(new Vector3(
                        MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f),
                        MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f),
                        message.ReadRangedSingle(0.0f, 1.0f, 8)));
@@ -572,6 +567,41 @@ namespace Barotrauma

            if (serverUpdateDelay > 0.0f) { return; }

+            WaterVolume = newWaterVolume;
+            OxygenPercentage = newOxygenPercentage;
+            
+            for (int i = 0; i < fireSourceCount; i++)
+            {
+                Vector2 pos = new Vector2(
+                    rect.X + rect.Width * newFireSources[i].X,
+                    rect.Y - rect.Height + (rect.Height * newFireSources[i].Y));
+                float size = newFireSources[i].Z * rect.Width;
+
+                var newFire = i < FireSources.Count ?
+                    FireSources[i] :
+                    new FireSource(Submarine == null ? pos : pos + Submarine.Position, null, true);
+                newFire.Position = pos;
+                newFire.Size = new Vector2(size, newFire.Size.Y);
+
+                //ignore if the fire wasn't added to this room (invalid position)?
+                if (!FireSources.Contains(newFire))
+                {
+                    newFire.Remove();
+                    continue;
+                }
+            }
+
+            for (int i = FireSources.Count - 1; i >= fireSourceCount; i--)
+            {
+                FireSources[i].Remove();
+                if (i < FireSources.Count)
+                {
+                    FireSources.RemoveAt(i);
+                }
+            }
+
+            if (serverUpdateDelay > 0.0f) { return; }
+
            ApplyRemoteState();
        }

@@ -31,8 +31,8 @@ namespace Barotrauma
                    GameMain.NetworkMember.CreateEntityEvent(this);
                    lastSentVolume = waterVolume;
                    lastSentOxygen = OxygenPercentage;
-                    sendUpdateTimer = NetConfig.HullUpdateInterval;
-                }
+                    sendUpdateTimer = NetworkUpdateInterval;
+                }                
            }
        }

@@ -175,11 +175,12 @@ namespace Barotrauma
            LimitSize();

            UpdateProjSpecific(growModifier);
-            
-            if (size.X < 1.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
-            {
-                Remove();
-            }
+
+#if CLIENT
+            if (GameMain.Client != null) return;
+#endif
+
+            if (size.X < 1.0f) Remove();
        }

        partial void UpdateProjSpecific(float growModifier);
@@ -292,6 +293,10 @@ namespace Barotrauma
            //evaporate some of the water
            hull.WaterVolume -= extinguishAmount;

+#if CLIENT
+            if (GameMain.Client != null) return;
+#endif
+
            if (size.X < 1.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
            {
                Remove();
@@ -320,11 +325,12 @@ namespace Barotrauma
            size.X -= extinguishAmount;

            hull.WaterVolume -= extinguishAmount;
-            
-            if (size.X < 1.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
-            {
-                Remove();
-            }
+
+#if CLIENT
+            if (GameMain.Client != null) return;
+#endif
+
+            if (size.X < 1.0f) Remove();
        }

        public void Extinguish(float deltaTime, float amount, Vector2 worldPosition)
@@ -35,8 +35,8 @@ namespace Barotrauma.Networking
        public const float DeleteDisconnectedTime = 20.0f;

        public const float ItemConditionUpdateInterval = 0.15f;
+
        public const float LevelObjectUpdateInterval = 0.5f;
-        public const float HullUpdateInterval = 0.5f;

        public const int MaxEventPacketsPerUpdate = 4;