epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't crash on in-game connection loss either

Browse Source
This commit is contained in:
Chris Forbes
2010-01-18 18:32:03 +13:00
parent 893dc15d81
commit 1b0187b089
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRa.Game/Orders/NetworkOrderSource.cs
View File

@@ -42,26 +42,34 @@ namespace OpenRa.Orders
{
var reader = new BinaryReader(socket.GetStream());
for (; ; )
try
{
var len = reader.ReadInt32();
var frame = reader.ReadInt32();
var buf = reader.ReadBytes(len - 4);
lock (orderBuffers)
for (; ; )
{
if (len == 5 && buf[0] == 0xef) /* got everything marker */
gotEverything[frame] = true;
else
var len = reader.ReadInt32();
var frame = reader.ReadInt32();
var buf = reader.ReadBytes(len - 4);
lock (orderBuffers)
{
/* accumulate this chunk */
if (!orderBuffers.ContainsKey(frame))
orderBuffers[frame] = new List<byte[]> { buf };
if (len == 5 && buf[0] == 0xef) /* got everything marker */
gotEverything[frame] = true;
else
orderBuffers[frame].Add(buf);
{
/* accumulate this chunk */
if (!orderBuffers.ContainsKey(frame))
orderBuffers[frame] = new List<byte[]> { buf };
else
orderBuffers[frame].Add(buf);
}
}
}
}
catch (IOException e)
{
State = ConnectionState.NotConnected;
}
}) { IsBackground = true }.Start();
}
catch