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

Fixed errors in netlobbyscreen when attempting to select a sub that fails to load (for example due to a missing/corrupt file), campaign cannot be started if the selected submarine cannot be loaded

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-08-06 14:28:54 +03:00
parent 1a50996774
commit 7c93730fc3
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
+8
View File
@@ -57,6 +57,14 @@ namespace Barotrauma
Submarine selectedSub = subList.SelectedData as Submarine; Submarine selectedSub = subList.SelectedData as Submarine;
if (selectedSub == null) return false; if (selectedSub == null) return false;
if (string.IsNullOrEmpty(selectedSub.MD5Hash.Hash))
{
((GUITextBlock)subList.Selected).TextColor = Color.DarkRed * 0.8f;
subList.Selected.CanBeFocused = false;
subList.Deselect();
return false;
}
string savePath = SaveUtil.CreateSavePath(isMultiplayer ? SaveUtil.SaveType.Multiplayer : SaveUtil.SaveType.Singleplayer, saveNameBox.Text); string savePath = SaveUtil.CreateSavePath(isMultiplayer ? SaveUtil.SaveType.Multiplayer : SaveUtil.SaveType.Singleplayer, saveNameBox.Text);
if (selectedSub.HasTag(SubmarineTag.Shuttle) || !selectedSub.CompatibleContentPackages.Contains(GameMain.SelectedPackage.Name)) if (selectedSub.HasTag(SubmarineTag.Shuttle) || !selectedSub.CompatibleContentPackages.Contains(GameMain.SelectedPackage.Name))
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+4 -3
View File
@@ -737,10 +737,11 @@ namespace Barotrauma
//hash will be null if opening the sub file failed -> don't select the sub //hash will be null if opening the sub file failed -> don't select the sub
if (string.IsNullOrWhiteSpace(hash)) if (string.IsNullOrWhiteSpace(hash))
{ {
if (component is GUITextBlock textBlock) GUITextBlock submarineTextBlock = component.GetChild<GUITextBlock>();
if (submarineTextBlock != null)
{ {
textBlock.TextColor = Color.DarkRed * 0.8f; submarineTextBlock.TextColor = Color.DarkRed * 0.8f;
textBlock.CanBeFocused = false; submarineTextBlock.CanBeFocused = false;
} }
else else
{ {