Re-enabled vote kicking, with some improvements: chat messages notifying about votes, kick button is disabled for the host's character or if already voted

This commit is contained in:
Regalis
2016-06-03 15:00:36 +03:00
parent 57abce298d
commit 0e24eab5e3
4 changed files with 50 additions and 28 deletions
+18 -5
View File
@@ -1492,12 +1492,15 @@ namespace Barotrauma.Networking
}
}
public override void SendChatMessage(string message)
public override void SendChatMessage(string message, ChatMessageType? type = null)
{
List<Client> recipients = new List<Client>();
Client targetClient = null;
ChatMessageType type = gameStarted && myCharacter != null ? ChatMessageType.Default : ChatMessageType.Server;
if (type == null)
{
type = gameStarted && myCharacter != null ? ChatMessageType.Default : ChatMessageType.Server;
}
string command = ChatMessage.GetChatMessageCommand(message, out message).ToLowerInvariant();
@@ -1536,12 +1539,17 @@ namespace Barotrauma.Networking
var chatMessage = ChatMessage.Create(
gameStarted && myCharacter != null ? myCharacter.Name : name,
message, type, gameStarted ? myCharacter : null);
message, (ChatMessageType)type, gameStarted ? myCharacter : null);
AddChatMessage(chatMessage);
if (!server.Connections.Any()) return;
SendChatMessage(chatMessage, recipients);
}
public void SendChatMessage(ChatMessage chatMessage, List<Client> recipients)
{
foreach (Client c in recipients)
{
ReliableMessage msg = c.ReliableChannel.CreateMessage();
@@ -1552,8 +1560,7 @@ namespace Barotrauma.Networking
chatMessage.WriteNetworkMessage(msg.InnerMessage);
c.ReliableChannel.SendMessage(msg, c.Connection);
}
}
}
private void ReadCharacterData(NetIncomingMessage message)
@@ -1844,6 +1851,7 @@ namespace Barotrauma.Networking
get { return kickVoters.Count; }
}
public Client(NetPeer server, string name, byte ID)
: this(name, ID)
{
@@ -1890,6 +1898,11 @@ namespace Barotrauma.Networking
{
kickVoters.Remove(voter);
}
public bool HasKickVoteFromID(int id)
{
return kickVoters.Any(k => k.ID == id);
}
public static void UpdateKickVotes(List<Client> connectedClients)