From c40c3a1a98bbc07ee0ba08edec5d5825d92803e0 Mon Sep 17 00:00:00 2001 From: Regalis Date: Thu, 25 May 2017 18:27:47 +0300 Subject: [PATCH] Clients don't modify the colors of the texts in the netlobby sub list, only their alpha --- Subsurface/Source/Networking/GameClient.cs | 2 +- Subsurface/Source/Screens/NetLobbyScreen.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs index aed3daedb..5d123786a 100644 --- a/Subsurface/Source/Networking/GameClient.cs +++ b/Subsurface/Source/Networking/GameClient.cs @@ -1057,7 +1057,7 @@ namespace Barotrauma.Networking ((Submarine)c.UserData).MD5Hash.Hash == newSub.MD5Hash.Hash) as GUITextBlock; if (textBlock == null) continue; - textBlock.TextColor = Color.White; + textBlock.TextColor = new Color(textBlock.TextColor, 1.0f); textBlock.UserData = newSub; textBlock.ToolTip = newSub.Description; diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs index 556de2f26..f5b648cb2 100644 --- a/Subsurface/Source/Screens/NetLobbyScreen.cs +++ b/Subsurface/Source/Screens/NetLobbyScreen.cs @@ -732,19 +732,19 @@ namespace Barotrauma if (matchingSub == null) { - subTextBlock.TextColor = Color.Gray; + subTextBlock.TextColor = new Color(subTextBlock.TextColor, 0.5f); subTextBlock.ToolTip = "Submarine not found in your submarine folder"; } else if (matchingSub.MD5Hash.Hash != sub.MD5Hash.Hash) { - subTextBlock.TextColor = Color.LightGray; + subTextBlock.TextColor = new Color(subTextBlock.TextColor, 0.5f); subTextBlock.ToolTip = "Your version of the submarine doesn't match the servers version"; } else { if (subList == shuttleList || subList == shuttleList.ListBox) { - subTextBlock.TextColor = sub.HasTag(SubmarineTag.Shuttle) ? Color.White : Color.DarkGray; + subTextBlock.TextColor = new Color(subTextBlock.TextColor, sub.HasTag(SubmarineTag.Shuttle) ? 1.0f : 0.6f); } }