vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed clients failing to select a received submarine/shuttle file, preventing them from starting a round until they rejoin the server. Closes #271

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-22 14:18:06 +02:00
parent b7bb78bc41
commit 83c02504ea
4 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+14 -1
View File
@@ -265,7 +265,7 @@ namespace Barotrauma
//respawn shuttle ------------------------------------------------------------------
shuttleTickBox = new GUITickBox(new Rectangle(columnX, 110, 20, 20), TextManager.Get("RespawnShuttle"), Alignment.Left, defaultModeContainer);
shuttleList = new GUIDropDown(new Rectangle(columnX, 140, 200, 20), "", "", defaultModeContainer);
shuttleList = new GUIDropDown(new Rectangle(columnX, 140, columnWidth, 20), "", "", defaultModeContainer);
shuttleTickBox.Selected = true;
shuttleTickBox.OnSelected = (GUITickBox box) =>
{
@@ -1421,6 +1421,9 @@ namespace Barotrauma
GameMain.Config.JobNamePreferences = jobNamePreferences;
}
public Pair<string, string> FailedSelectedSub;
public Pair<string, string> FailedSelectedShuttle;
public bool TrySelectSub(string subName, string md5Hash, GUIListBox subList)
{
if (GameMain.Client == null) return false;
@@ -1440,10 +1443,20 @@ namespace Barotrauma
subList.OnSelected -= VotableClicked;
subList.Select(subList.children.IndexOf(matchingListSub), true);
subList.OnSelected += VotableClicked;
if (subList == SubList)
FailedSelectedSub = null;
else
FailedSelectedShuttle = null;
}
if (sub == null || sub.MD5Hash.Hash != md5Hash)
{
if (subList == SubList)
FailedSelectedSub = Pair<string, string>.Create(subName, md5Hash);
else
FailedSelectedShuttle = Pair<string, string>.Create(subName, md5Hash);
string errorMsg = "";
if (sub == null)
{