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

Added votekick button to the server lobby. Closes #190

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-01-10 20:43:31 +02:00
parent 43ceb208ef
commit bd1cd15dd4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+1 -1
View File
@@ -1380,7 +1380,7 @@ namespace Barotrauma.Networking
public bool VoteForKick(GUIButton button, object userdata) public bool VoteForKick(GUIButton button, object userdata)
{ {
var votedClient = otherClients.Find(c => c.Character == userdata); var votedClient = userdata is Client ? (Client)userdata : otherClients.Find(c => c.Character == userdata);
if (votedClient == null) return false; if (votedClient == null) return false;
votedClient.AddKickVote(new Client(name, ID)); votedClient.AddKickVote(new Client(name, ID));
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+12 -2
View File
@@ -874,11 +874,14 @@ namespace Barotrauma
if (GameMain.Client != null) if (GameMain.Client != null)
{ {
if (!GameMain.Client.HasPermission(ClientPermissions.Ban) && if (!GameMain.Client.HasPermission(ClientPermissions.Ban) &&
!GameMain.Client.HasPermission(ClientPermissions.Kick)) !GameMain.Client.HasPermission(ClientPermissions.Kick) &&
!GameMain.Client.Voting.AllowVoteKick)
{ {
return false; return false;
} }
} }
var selectedClient = GameMain.NetworkMember.ConnectedClients.Find(c => c.Name == obj.ToString());
playerFrame = new GUIFrame(new Rectangle(0, 0, 0, 0), Color.Black * 0.6f); playerFrame = new GUIFrame(new Rectangle(0, 0, 0, 0), Color.Black * 0.6f);
@@ -891,7 +894,6 @@ namespace Barotrauma
if (GameMain.Server != null) if (GameMain.Server != null)
{ {
var selectedClient = GameMain.Server.ConnectedClients.Find(c => c.Name == obj.ToString());
playerFrame.UserData = selectedClient; playerFrame.UserData = selectedClient;
new GUITextBlock(new Rectangle(0, 25, 150, 15), selectedClient.Connection.RemoteEndPoint.Address.ToString(), "", playerFrameInner); new GUITextBlock(new Rectangle(0, 25, 150, 15), selectedClient.Connection.RemoteEndPoint.Address.ToString(), "", playerFrameInner);
@@ -1025,6 +1027,14 @@ namespace Barotrauma
rangebanButton.OnClicked += BanPlayerRange; rangebanButton.OnClicked += BanPlayerRange;
rangebanButton.OnClicked += ClosePlayerFrame; rangebanButton.OnClicked += ClosePlayerFrame;
} }
if (GameMain.Client != null && GameMain.Client.Voting.AllowVoteKick && selectedClient != null)
{
var kickVoteButton = new GUIButton(new Rectangle(0, -30, 120, 20), "Vote to Kick", Alignment.BottomLeft, "", playerFrameInner);
kickVoteButton.Enabled = !selectedClient.HasKickVoteFromID(GameMain.Client.ID);
kickVoteButton.UserData = selectedClient;
kickVoteButton.OnClicked += GameMain.Client.VoteForKick;
}
var closeButton = new GUIButton(new Rectangle(0, 0, 100, 20), TextManager.Get("Close"), Alignment.BottomRight, "", playerFrameInner); var closeButton = new GUIButton(new Rectangle(0, 0, 100, 20), TextManager.Get("Close"), Alignment.BottomRight, "", playerFrameInner);
closeButton.OnClicked = ClosePlayerFrame; closeButton.OnClicked = ClosePlayerFrame;