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

Fixed clients being unable to select subs, GUIListBoxes can be scrolled even if selection is disabled

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-01-28 19:14:24 +02:00
parent cdff422920
commit 8b3a089884
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
-2
View File
@@ -306,8 +306,6 @@ namespace Barotrauma
UpdateChildrenRect(deltaTime); UpdateChildrenRect(deltaTime);
if (!enabled) return;
if (scrollBarEnabled && !scrollBarHidden) scrollBar.Update(deltaTime); if (scrollBarEnabled && !scrollBarHidden) scrollBar.Update(deltaTime);
if ((MouseOn == this || MouseOn == scrollBar || IsParentOf(MouseOn)) && PlayerInput.ScrollWheelSpeed != 0) if ((MouseOn == this || MouseOn == scrollBar || IsParentOf(MouseOn)) && PlayerInput.ScrollWheelSpeed != 0)
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+2 -2
View File
@@ -1434,7 +1434,7 @@ namespace Barotrauma
Submarine sub = Submarine.SavedSubmarines.Find(m => m.Name == subName && m.MD5Hash.Hash == md5Hash); Submarine sub = Submarine.SavedSubmarines.Find(m => m.Name == subName && m.MD5Hash.Hash == md5Hash);
if (sub == null) sub = Submarine.SavedSubmarines.Find(m => m.Name == subName); if (sub == null) sub = Submarine.SavedSubmarines.Find(m => m.Name == subName);
var matchingListSub = subList.children.Find(c => c.UserData == sub) as GUITextBlock; var matchingListSub = subList.children.Find(c => c.UserData == sub);
if (matchingListSub != null) if (matchingListSub != null)
{ {
subList.OnSelected -= VotableClicked; subList.OnSelected -= VotableClicked;
@@ -1452,7 +1452,7 @@ namespace Barotrauma
else if (sub.MD5Hash.Hash == null) else if (sub.MD5Hash.Hash == null)
{ {
errorMsg = TextManager.Get("SubLoadError").Replace("[subname]", subName) + " "; errorMsg = TextManager.Get("SubLoadError").Replace("[subname]", subName) + " ";
if (matchingListSub != null) matchingListSub.TextColor = Color.Red; if (matchingListSub != null) matchingListSub.GetChild<GUITextBox>().TextColor = Color.Red;
} }
else else
{ {