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

2f107db...5202af9

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/Voting.cs
+11 -48
View File
@@ -15,20 +15,12 @@ namespace Barotrauma
{
if (value == allowSubVoting) return;
allowSubVoting = value;
GameMain.NetLobbyScreen.SubList.Enabled = value || GameMain.Server != null ||
GameMain.NetLobbyScreen.SubList.Enabled = value ||
(GameMain.Client != null && GameMain.Client.HasPermission(ClientPermissions.SelectSub));
GameMain.NetLobbyScreen.InfoFrame.FindChild("subvotes", true).Visible = value;
if (GameMain.Server != null)
{
UpdateVoteTexts(value ? GameMain.Server.ConnectedClients : null, VoteType.Sub);
GameMain.Server.UpdateVoteStatus();
}
else
{
UpdateVoteTexts(null, VoteType.Sub);
GameMain.NetLobbyScreen.SubList.Deselect();
}
UpdateVoteTexts(null, VoteType.Sub);
GameMain.NetLobbyScreen.SubList.Deselect();
}
}
public bool AllowModeVoting
@@ -39,7 +31,7 @@ namespace Barotrauma
if (value == allowModeVoting) return;
allowModeVoting = value;
GameMain.NetLobbyScreen.ModeList.Enabled =
value || GameMain.Server != null ||
value ||
(GameMain.Client != null && GameMain.Client.HasPermission(ClientPermissions.SelectMode));
GameMain.NetLobbyScreen.InfoFrame.FindChild("modevotes", true).Visible = value;
@@ -51,17 +43,9 @@ namespace Barotrauma
new Color(comp.TextColor.R, comp.TextColor.G, comp.TextColor.B,
!allowModeVoting || ((GameModePreset)comp.UserData).Votable ? (byte)255 : (byte)100);
}
if (GameMain.Server != null)
{
UpdateVoteTexts(value ? GameMain.Server.ConnectedClients : null, VoteType.Mode);
GameMain.Server.UpdateVoteStatus();
}
else
{
UpdateVoteTexts(null, VoteType.Mode);
GameMain.NetLobbyScreen.ModeList.Deselect();
}
UpdateVoteTexts(null, VoteType.Mode);
GameMain.NetLobbyScreen.ModeList.Deselect();
}
}
@@ -91,28 +75,11 @@ namespace Barotrauma
if (clients == null) return;
foreach (Client client in clients)
{
var clientNameBox = GameMain.NetLobbyScreen.PlayerList.Content.FindChild(client.Name);
if (clientNameBox == null) continue;
var clientReady = clientNameBox.FindChild("clientready");
if (!client.GetVote<bool>(VoteType.StartRound))
var clientReady = GameMain.NetLobbyScreen.PlayerList.Content.FindChild(client)?.FindChild("clientready");
if (clientReady != null)
{
if (clientReady != null) clientReady.Parent.RemoveChild(clientReady);
clientReady.Visible = client.GetVote<bool>(VoteType.StartRound);
}
else
{
if (clientReady == null)
{
new GUITickBox(new RectTransform(new Vector2(0.05f, 0.6f), clientNameBox.RectTransform, Anchor.CenterRight) { RelativeOffset = new Vector2(0.05f, 0.0f) }, "")
{
Selected = true,
Enabled = false,
ToolTip = "Ready to start",
UserData = "clientready"
};
}
}
}
break;
}
@@ -140,8 +107,6 @@ namespace Barotrauma
public void ClientWrite(NetBuffer msg, VoteType voteType, object data)
{
if (GameMain.Server != null) return;
msg.Write((byte)voteType);
switch (voteType)
@@ -176,10 +141,8 @@ namespace Barotrauma
msg.WritePadBits();
}
public void ClientRead(NetIncomingMessage inc)
public void ClientRead(NetBuffer inc)
{
if (GameMain.Server != null) return;
AllowSubVoting = inc.ReadBoolean();
if (allowSubVoting)
{