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

InGame update messages include a timestamp which is passed to the ClientRead methods

Browse Source 
Now only used in character position syncing, but some other entities may also have an use for it (e.g. discarding outdated data)
This commit is contained in:
Regalis
2016-10-18 19:04:32 +03:00
parent b68eeda8a8
commit 9fed308705
17 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/Networking/EntityRemover.cs
View File

@@ -58,7 +58,7 @@ namespace Barotrauma
}
}
public void ClientRead(Lidgren.Network.NetIncomingMessage message)
public void ClientRead(Lidgren.Network.NetIncomingMessage message, float sendingTime)
{
if (GameMain.Server != null) return;

2
Subsurface/Source/Networking/EntitySpawner.cs
View File

@@ -145,7 +145,7 @@ namespace Barotrauma
}
}
public void ClientRead(Lidgren.Network.NetIncomingMessage message)
public void ClientRead(Lidgren.Network.NetIncomingMessage message, float sendingTime)
{
if (GameMain.Server != null) return;

14
Subsurface/Source/Networking/GameClient.cs
View File

@@ -696,6 +696,8 @@ namespace Barotrauma.Networking
private void ReadIngameUpdate(NetIncomingMessage inc)
{
float sendingTime = inc.ReadFloat() - inc.SenderConnection.RemoteTimeOffset;
ServerNetObject objHeader;
while ((objHeader = (ServerNetObject)inc.ReadByte()) != ServerNetObject.END_OF_MESSAGE)
{
@@ -705,24 +707,18 @@ namespace Barotrauma.Networking
lastSentChatMsgID = inc.ReadUInt32();
break;
case ServerNetObject.CHARACTER_POSITION:
//bool dead = inc.ReadBoolean();
Character.ClientReadStatic(inc);
Character.ClientReadStatic(inc, sendingTime);
inc.ReadPadBits();
//if (Character.Controlled != null)
//{
// if (dead && !Character.Controlled.IsDead)
// Character.Controlled.Kill(CauseOfDeath.Damage);
//}
break;
case ServerNetObject.CHAT_MESSAGE:
ChatMessage.ClientRead(inc);
break;
case ServerNetObject.ENTITY_SPAWN:
Item.Spawner.ClientRead(inc);
Item.Spawner.ClientRead(inc, sendingTime);
inc.ReadPadBits();
break;
case ServerNetObject.ENTITY_REMOVE:
Item.Remover.ClientRead(inc);
Item.Remover.ClientRead(inc, sendingTime);
inc.ReadPadBits();
break;
default:

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

@@ -625,6 +625,8 @@ namespace Barotrauma.Networking
{
NetOutgoingMessage outmsg = server.CreateMessage();
outmsg.Write((byte)ServerPacketHeader.UPDATE_INGAME);
outmsg.Write((float)NetTime.Now);
outmsg.Write((byte)ServerNetObject.SYNC_IDS);
outmsg.Write(c.lastSentChatMsgID); //send this to client so they know which chat messages weren't received by the server

2
Subsurface/Source/Networking/INetSerializable.cs
View File

@@ -22,6 +22,6 @@ namespace Barotrauma.Networking
UInt32 NetStateID { get; }
void ServerWrite(NetOutgoingMessage msg, Client c);
void ClientRead(NetIncomingMessage msg);
void ClientRead(NetIncomingMessage msg, float sendingTime);
}
}