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

ItemInventories don't have own ID's anymore but rely on owner ID, relaying reliablemessages through server

Browse Source
This commit is contained in:
Regalis
2015-10-21 01:39:00 +03:00
parent daf1e2bfd8
commit 0233579e37
12 changed files with 118 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Networking/ReliableSender.cs
+11 -11
View File
@@ -79,16 +79,14 @@ namespace Barotrauma.Networking.ReliableMessages
public ReliableMessage CreateMessage()
{
if (messageCount == ushort.MaxValue) messageCount = 0;
messageCount++;
ushort messageID = (messageCount==ushort.MaxValue) ? (ushort)0 : (ushort)(messageCount + 1);
NetOutgoingMessage message = sender.CreateMessage();
var reliableMessage = new ReliableMessage(message, messageCount);
messageBuffer.Add(reliableMessage.ID, reliableMessage);
var reliableMessage = new ReliableMessage(message, messageID);
message.Write((byte)PacketTypes.ReliableMessage);
message.Write(messageCount);
message.Write(messageID);
int bufferSize=100;
if (messageBuffer.Count>bufferSize)
@@ -117,10 +115,7 @@ namespace Barotrauma.Networking.ReliableMessages
messageBuffer.Remove(i);
if (i == ushort.MaxValue) break;
Debug.WriteLine("removing message " + i);
}
}
}
return reliableMessage;
@@ -133,6 +128,11 @@ namespace Barotrauma.Networking.ReliableMessages
ackInterval = 0.0f;
ackTimer = connection.AverageRoundtripTime;
messageBuffer.Add(message.ID, message);
if (messageCount == ushort.MaxValue) messageCount = 0;
messageCount++;
message.SaveInnerMessage();
sender.SendMessage(message.InnerMessage, connection, NetDeliveryMethod.Unreliable, 0);
@@ -172,7 +172,7 @@ namespace Barotrauma.Networking.ReliableMessages
if (ackTimer > 0.0f) return;
Debug.WriteLine("Sending ack message: "+messageCount);
//Debug.WriteLine("Sending ack message: "+messageCount);
NetOutgoingMessage message = sender.CreateMessage();
message.Write((byte)PacketTypes.Ack);
@@ -337,7 +337,7 @@ namespace Barotrauma.Networking.ReliableMessages
//id matches, all good
if (messageId == lastMessageID)
{
Debug.WriteLine("Received ack message: " + messageId + ", all good");
//Debug.WriteLine("Received ack message: " + messageId + ", all good");
return;
}