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

MonsterEvent spawns monsters at start, writing networkeventtype using WriteRangedInt instead of WriteByte

Browse Source
This commit is contained in:
Regalis11
2016-01-31 17:39:50 +02:00
parent 92a162cbf5
commit 7f78582df7
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Subsurface/Source/Networking/NetworkEvent.cs
View File

@@ -125,7 +125,7 @@ namespace Barotrauma.Networking
public bool FillData(NetBuffer message)
{
message.Write((byte)eventType);
message.WriteRangedInteger(0, Enum.GetValues(typeof(NetworkEventType)).Length, (int)eventType);
Entity e = Entity.FindEntityByID(id);
if (e == null) return false;
@@ -182,7 +182,7 @@ namespace Barotrauma.Networking
try
{
eventType = (NetworkEventType)message.ReadByte();
eventType = (NetworkEventType)message.ReadRangedInteger(0, Enum.GetValues(typeof(NetworkEventType)).Length);
id = message.ReadUInt16();
}
catch

7
Subsurface/Source/Networking/ReliableSender.cs
View File

@@ -188,7 +188,9 @@ namespace Barotrauma.Networking.ReliableMessages
sender.SendMessage(message, recipient, NetDeliveryMethod.Unreliable);
idSendTimer = Math.Max(recipient.AverageRoundtripTime, NetConfig.IdSendInterval+idSendInterval);
float roundTripTime = Math.Min(recipient.AverageRoundtripTime, 0.5f);
idSendTimer = Math.Max(roundTripTime, NetConfig.IdSendInterval+idSendInterval);
idSendInterval += 0.1f;
}
}
@@ -246,8 +248,9 @@ namespace Barotrauma.Networking.ReliableMessages
receiver.SendMessage(resendRequest, recipient,
missingMessage.ResendRequestsSent==0 ? NetDeliveryMethod.ReliableUnordered : NetDeliveryMethod.Unreliable);
float roundTripTime = Math.Min(recipient.AverageRoundtripTime, 0.5f);
missingMessage.ResendTimer = Math.Max(recipient.AverageRoundtripTime, NetConfig.RerequestInterval);
missingMessage.ResendTimer = Math.Max(roundTripTime, NetConfig.RerequestInterval);
missingMessage.ResendRequestsSent++;
}