v0.3.4.2: fixed section bodies not being restored after repairing a wall/window, fixed servers letting all clients in despite a wrong password, game version or content package

This commit is contained in:
Regalis
2016-03-05 12:50:22 +02:00
10 changed files with 45 additions and 26 deletions
@@ -299,18 +299,18 @@ namespace Barotrauma
return true;
}
public void JoinServer(string ip, bool hasPassword)
public void JoinServer(string ip, bool hasPassword, string msg = "Password required")
{
CoroutineManager.StartCoroutine(ConnectToServer(ip, hasPassword));
CoroutineManager.StartCoroutine(ConnectToServer(ip, hasPassword, msg));
}
private IEnumerable<object> ConnectToServer(string ip, bool hasPassword)
private IEnumerable<object> ConnectToServer(string ip, bool hasPassword, string msg = "Password required")
{
string selectedPassword = "";
if (hasPassword)
{
var msgBox = new GUIMessageBox("Password required:", "", new string[] { "OK", "Cancel" });
var msgBox = new GUIMessageBox(msg, "", new string[] { "OK", "Cancel" });
var passwordBox = new GUITextBox(new Rectangle(0,40,150,25), Alignment.TopLeft, GUI.Style, msgBox.children[0]);
passwordBox.UserData = "password";