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

Move chat message serialization to the ChatMessage class

Browse Source
This commit is contained in:
juanjp600
2016-09-07 21:41:59 -03:00
parent 404c506662
commit 7c9ae5134c
3 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Subsurface/Source/Networking/GameServer.cs
View File

@@ -566,14 +566,7 @@ namespace Barotrauma.Networking
}
break;
case ClientNetObject.CHAT_MESSAGE:
UInt32 ID = inc.ReadUInt32();
string msg = inc.ReadString();
if (c.lastSentChatMsgID<ID)
{
//this chat message is new to the server
AddChatMessage(msg, ChatMessageType.Default, c.name);
c.lastSentChatMsgID = ID;
}
ChatMessage.ServerRead(inc, c);
break;
}
}
@@ -665,11 +658,7 @@ namespace Barotrauma.Networking
ChatMessage cMsg = (ChatMessage)gc.UserData;
if (cMsg.NetStateID > c.lastRecvChatMsgID)
{
outmsg.Write((byte)ServerNetObject.CHAT_MESSAGE);
outmsg.Write(cMsg.NetStateID);
outmsg.Write((byte)cMsg.Type);
outmsg.Write(cMsg.SenderName);
outmsg.Write(cMsg.Text);
cMsg.ServerWrite(outmsg,c);
}
}
}