(a410fd46c) Trying to help the merge script through a jungle of merges

Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs

@@ -194,8 +194,7 @@ namespace Barotrauma.Networking
             Hull.EditFire = false;
             Hull.EditWater = false;
 
-            newName = newName.Replace(":", "").Replace(";", "");
-            name = newName;
+            Name = newName;
 
             entityEventManager = new ClientEntityEventManager(this);
 
@@ -473,7 +472,8 @@ namespace Barotrauma.Networking
                     var passwordBox = new GUITextBox(new RectTransform(new Vector2(0.8f, 0.1f), msgBox.InnerFrame.RectTransform, Anchor.Center) { MinSize = new Point(0, 20) })
                     {
                         IgnoreLayoutGroups = true,
-                        UserData = "password"
+                        UserData = "password",
+                        Censor = true
                     };
 
                     var okButton = msgBox.Buttons[0];
@@ -1303,6 +1303,11 @@ namespace Barotrauma.Networking
                     if (existingClient.ID == myID)
                     {
                         existingClient.SetPermissions(permissions, permittedConsoleCommands);
+                        name = tc.Name;
+                        if (GameMain.NetLobbyScreen.CharacterNameBox != null)
+                        {
+                            GameMain.NetLobbyScreen.CharacterNameBox.Text = name;
+                        }
                     }
                     currentClients.Add(existingClient);
                 }
@@ -1562,6 +1567,7 @@ namespace Barotrauma.Networking
             outmsg.Write(GameMain.NetLobbyScreen.LastUpdateID);
             outmsg.Write(ChatMessage.LastID);
             outmsg.Write(LastClientListUpdateID);
+            outmsg.Write(name);
 
             var campaign = GameMain.GameSession?.GameMode as MultiPlayerCampaign;
             if (campaign == null || campaign.LastSaveID == 0)
@@ -1581,8 +1587,8 @@ namespace Barotrauma.Networking
             {
                 if (outmsg.LengthBytes + chatMsgQueue[i].EstimateLengthBytesClient() > client.Configuration.MaximumTransmissionUnit - 5)
                 {
-                    //not enough room in this packet
-                    return;
+                    //no more room in this packet
+                    break;
                 }
                 chatMsgQueue[i].ClientWrite(outmsg);
             }
@@ -1617,7 +1623,7 @@ namespace Barotrauma.Networking
                 if (outmsg.LengthBytes + chatMsgQueue[i].EstimateLengthBytesClient() > client.Configuration.MaximumTransmissionUnit - 5)
                 {
                     //not enough room in this packet
-                    return;
+                    break;
                 }
                 chatMsgQueue[i].ClientWrite(outmsg);
             }

Barotrauma/BarotraumaClient/Source/Networking/RespawnManager.cs

@@ -11,5 +11,15 @@ namespace Barotrauma.Networking
                 respawnTimer = Math.Max(0.0f, respawnTimer - deltaTime);
             }
         }
+
+        partial void UpdateTransportingProjSpecific(float deltaTime)
+        {
+            if (shuttleTransportTimer + deltaTime > 15.0f && shuttleTransportTimer <= 15.0f &&
+                GameMain.Client?.Character != null &&
+                GameMain.Client.Character.Submarine == respawnShuttle)
+            {
+                GameMain.Client.AddChatMessage("ServerMessage.ShuttleLeaving", ChatMessageType.Server);
+            }
+        }
     }
 }

Barotrauma/BarotraumaClient/Source/Networking/ServerInfo.cs

@@ -71,15 +71,16 @@ namespace Barotrauma.Networking
                 Stretch = true
             };
 
-            var titleHolder = new GUILayoutGroup(new RectTransform(new Vector2(0.97f, 0.07f), previewContainer.RectTransform))
+            var titleHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.07f), previewContainer.RectTransform))
             {
                 IsHorizontal = true,
                 Stretch = true
             };
 
-            var title = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), titleHolder.RectTransform), ServerName, font: GUI.LargeFont, wrap: true);
+            var title = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1.0f), titleHolder.RectTransform), ServerName, font: GUI.LargeFont, wrap: true);
+            title.Text = ToolBox.LimitString(title.Text, title.Font, title.Rect.Width);
 
-            new GUITextBlock(new RectTransform(Vector2.One, title.RectTransform),
+            new GUITextBlock(new RectTransform(new Vector2(0.3f, 1.0f), titleHolder.RectTransform),
                 TextManager.AddPunctuation(':', TextManager.Get("ServerListVersion"), string.IsNullOrEmpty(GameVersion) ? TextManager.Get("Unknown") : GameVersion), 
                 textAlignment: Alignment.Right);
 

Barotrauma/BarotraumaClient/Source/Networking/SteamManager.cs

@@ -63,6 +63,15 @@ namespace Barotrauma.Steam
             return instance.client.SteamId;
         }
 
+        public static string GetUsername()
+        {
+            if (instance == null || !instance.isInitialized)
+            {
+                return "";
+            }
+            return instance.client.Username;
+        }
+
         public static ulong GetWorkshopItemIDFromUrl(string url)
         {
             try

Barotrauma/BarotraumaClient/Source/Networking/Voip/VoipCapture.cs

@@ -1,6 +1,6 @@
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using OpenTK.Audio.OpenAL;
+using OpenAL;
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -69,7 +69,7 @@ namespace Barotrauma.Networking
             VoipConfig.SetupEncoding();
 
             //set up capture device
-            captureDevice = Alc.CaptureOpenDevice(deviceName, VoipConfig.FREQUENCY, ALFormat.Mono16, VoipConfig.BUFFER_SIZE * 5);
+            captureDevice = Alc.CaptureOpenDevice(deviceName, VoipConfig.FREQUENCY, Al.FormatMono16, VoipConfig.BUFFER_SIZE * 5);
 
             if (captureDevice == IntPtr.Zero)
             {
@@ -88,20 +88,20 @@ namespace Barotrauma.Networking
                 return;
             }
 
-            ALError alError = AL.GetError();
-            AlcError alcError = Alc.GetError(captureDevice);
-            if (alcError != AlcError.NoError)
+            int alError = Al.GetError();
+            int alcError = Alc.GetError(captureDevice);
+            if (alcError != Alc.NoError)
             {
                 throw new Exception("Failed to open capture device: " + alcError.ToString() + " (ALC)");
             }
-            if (alError != ALError.NoError)
+            if (alError != Al.NoError)
             {
                 throw new Exception("Failed to open capture device: " + alError.ToString() + " (AL)");
             }
 
             Alc.CaptureStart(captureDevice);
             alcError = Alc.GetError(captureDevice);
-            if (alcError != AlcError.NoError)
+            if (alcError != Alc.NoError)
             {
                 throw new Exception("Failed to start capturing: " + alcError.ToString());
             }
@@ -132,11 +132,11 @@ namespace Barotrauma.Networking
             short[] uncompressedBuffer = new short[VoipConfig.BUFFER_SIZE];
             while (capturing)
             {
-                AlcError alcError;
-                Alc.GetInteger(captureDevice, AlcGetInteger.CaptureSamples, 1, out int sampleCount);
+                int alcError;
+                Alc.GetInteger(captureDevice, Alc.EnumCaptureSamples, out int sampleCount);
 
                 alcError = Alc.GetError(captureDevice);
-                if (alcError != AlcError.NoError)
+                if (alcError != Alc.NoError)
                 {
                     throw new Exception("Failed to determine sample count: " + alcError.ToString());
                 }
@@ -160,7 +160,7 @@ namespace Barotrauma.Networking
                 }
 
                 alcError = Alc.GetError(captureDevice);
-                if (alcError != AlcError.NoError)
+                if (alcError != Alc.NoError)
                 {
                     throw new Exception("Failed to capture samples: " + alcError.ToString());
                 }
@@ -214,7 +214,7 @@ namespace Barotrauma.Networking
                     }
                 }
 
-                Thread.Sleep(VoipConfig.BUFFER_SIZE * 800 / VoipConfig.FREQUENCY);
+                Thread.Sleep(10);
             }
         }