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

0.15.21.0

Browse Source
This commit is contained in:
Markus Isberg
2021-12-16 01:05:43 +09:00
parent 617d9ede88
commit 7d43cb1e91
74 changed files with 487 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs
+1
View File
@@ -1470,6 +1470,7 @@ namespace Barotrauma.Networking
serverSettings.AllowFriendlyFire = inc.ReadBoolean();
serverSettings.LockAllDefaultWires = inc.ReadBoolean();
serverSettings.AllowRagdollButton = inc.ReadBoolean();
serverSettings.AllowLinkingWifiToChat = inc.ReadBoolean();
GameMain.NetLobbyScreen.UsingShuttle = inc.ReadBoolean();
GameMain.LightManager.LosMode = (LosMode)inc.ReadByte();
bool includesFinalize = inc.ReadBoolean(); inc.ReadPadBits();
Barotrauma/BarotraumaClient/ClientSource/Networking/ServerSettings.cs
+2 -3
View File
@@ -92,9 +92,8 @@ namespace Barotrauma.Networking
}
}
public void ClientAdminRead(IReadMessage incMsg, NetFlags requiredFlags)
public void ClientAdminRead(IReadMessage incMsg)
{
if (!requiredFlags.HasFlag(NetFlags.Properties)) { return; }
int count = incMsg.ReadUInt16();
for (int i = 0; i < count; i++)
{
@@ -162,7 +161,7 @@ namespace Barotrauma.Networking
incMsg.ReadPadBits();
if (isAdmin)
{
ClientAdminRead(incMsg, requiredFlags);
ClientAdminRead(incMsg);
}
}
Barotrauma/BarotraumaClient/ClientSource/Networking/Voting.cs
+5 -1
View File
@@ -17,7 +17,11 @@ namespace Barotrauma
allowSubVoting = value;
GameMain.NetLobbyScreen.SubList.Enabled = value ||
(GameMain.Client != null && GameMain.Client.HasPermission(ClientPermissions.SelectSub));
GameMain.NetLobbyScreen.Frame.FindChild("subvotes", true).Visible = value;
var subVotesLabel = GameMain.NetLobbyScreen.Frame.FindChild("subvotes", true) as GUITextBlock;
subVotesLabel.Visible = value;
var subVisButton = GameMain.NetLobbyScreen.SubVisibilityButton;
subVisButton.RectTransform.AbsoluteOffset
= new Point(value ? (int)(subVotesLabel.TextSize.X + subVisButton.Rect.Width) : 0, 0);
UpdateVoteTexts(null, VoteType.Sub);
GameMain.NetLobbyScreen.SubList.Deselect();