Merge remote-tracking branch 'origin/master' into antagonists

2017-12-03 13:10:04 +03:00
parent 56df7b6900 ddf9ad26b8
commit ca535d295f
29 changed files with 359 additions and 248 deletions
@@ -1873,11 +1873,6 @@ namespace Barotrauma.Networking

        private void FileTransferChanged(FileSender.FileTransferOut transfer)
        {
-            if (connectedClients.Any(c=> c.Connection == null))
-            {
-                int sdfgsdfg = 1;
-            }
-
            Client recipient = connectedClients.Find(c => c.Connection == transfer.Connection);
 #if CLIENT
            UpdateFileTransferIndicator(recipient);
@@ -3,10 +3,7 @@
    static class NetConfig
    {
        public const int DefaultPort = 14242;
-
-        //UpdateEntity networkevents aren't sent to clients if they're further than this from the entity
-        public const float UpdateEntityDistance = 2500.0f;
-
+        
        public const int MaxPlayers = 16;

        public static string MasterServerUrl = GameMain.Config.MasterServerUrl;
@@ -20,14 +17,6 @@
        //send a position update to clients (in sim units)
        public const float ItemPosUpdateDistance = 2.0f;
        
-        public const float LargeCharacterUpdateInterval = 5.0f;
-
-        public const float DeleteDisconnectedTime = 10.0f;
-
-        public const float IdSendInterval = 0.2f;
-        public const float RerequestInterval = 0.2f;
-
-        public const int ReliableMessageBufferSize = 500;
-        public const int ResendAttempts = 10;
+        public const float DeleteDisconnectedTime = 10.0f;        
    }
 }