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

The host can send chat messages, fixed client not being passed to ServerRead methods

Browse Source
This commit is contained in:
Regalis
2016-12-09 16:45:08 +02:00
parent e4744e8385
commit bea523187b
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Character.cs
+1 -1
View File
@@ -1328,7 +1328,7 @@ namespace Barotrauma
{ {
isStillCountdown = 15; isStillCountdown = 15;
} }
DebugConsole.NewMessage(Convert.ToString(memInput.Count), Color.Lime); //DebugConsole.NewMessage(Convert.ToString(memInput.Count), Color.Lime);
} }
else else
{ {
Subsurface/Source/Networking/GameServer.cs
+13 -2
View File
@@ -1200,8 +1200,19 @@ namespace Barotrauma.Networking
if (c.Character != traitor) continue; if (c.Character != traitor) continue;
traitorClient = c; traitorClient = c;
break; break;
} }
}
public override void SendChatMessage(string message, ChatMessageType? type = null)
{
type = ChatMessageType.Default;
ChatMessage chatMessage = ChatMessage.Create(
gameStarted && myCharacter != null ? myCharacter.Name : name,
message, (ChatMessageType)type, gameStarted ? myCharacter : null);
AddChatMessage(chatMessage);
} }
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch) public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)
Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
+2 -2
View File
@@ -52,7 +52,7 @@ namespace Barotrauma.Networking
/// <summary> /// <summary>
/// Read the events from the message, ignoring ones we've already received /// Read the events from the message, ignoring ones we've already received
/// </summary> /// </summary>
protected void Read(NetIncomingMessage msg, float sendingTime, ref UInt32 lastReceivedID) protected void Read(NetIncomingMessage msg, float sendingTime, ref UInt32 lastReceivedID, Client sender = null)
{ {
UInt32 firstEventID = msg.ReadUInt32(); UInt32 firstEventID = msg.ReadUInt32();
int eventCount = msg.ReadByte(); int eventCount = msg.ReadByte();
@@ -75,7 +75,7 @@ namespace Barotrauma.Networking
{ {
DebugConsole.NewMessage("received msg "+thisEventID, Microsoft.Xna.Framework.Color.Green); DebugConsole.NewMessage("received msg "+thisEventID, Microsoft.Xna.Framework.Color.Green);
lastReceivedID++; lastReceivedID++;
ReadEvent(msg, entity, sendingTime); ReadEvent(msg, entity, sendingTime, sender);
} }
msg.ReadPadBits(); msg.ReadPadBits();
} }
Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
+5 -1
View File
@@ -12,10 +12,14 @@ namespace Barotrauma.Networking
private List<ServerEntityEvent> events; private List<ServerEntityEvent> events;
private UInt32 ID; private UInt32 ID;
private GameServer server;
public ServerEntityEventManager(GameServer server) public ServerEntityEventManager(GameServer server)
{ {
events = new List<ServerEntityEvent>(); events = new List<ServerEntityEvent>();
this.server = server;
} }
public void CreateEvent(IServerSerializable entity, object[] extraData = null) public void CreateEvent(IServerSerializable entity, object[] extraData = null)
@@ -91,7 +95,7 @@ namespace Barotrauma.Networking
public void Read(NetIncomingMessage msg, Client client) public void Read(NetIncomingMessage msg, Client client)
{ {
base.Read(msg, 0.0f, ref client.lastSentEntityEventID); base.Read(msg, 0.0f, ref client.lastSentEntityEventID, client);
} }
public void Clear() public void Clear()