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

Use Stream.Write(int) extension method where possible.

Browse Source
This commit is contained in:
RoosterDragon
2020-10-18 11:33:38 +01:00
committed by abcdefg30
parent f428a44bfc
commit f5f2f58664
6 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Network/Connection.cs
View File

@@ -260,14 +260,14 @@ namespace OpenRA.Network
try
{
var ms = new MemoryStream();
ms.WriteArray(BitConverter.GetBytes(packet.Length));
ms.Write(packet.Length);
ms.WriteArray(packet);
foreach (var s in queuedSyncPackets)
{
var q = OrderIO.SerializeSync(s);
ms.WriteArray(BitConverter.GetBytes(q.Length));
ms.Write(q.Length);
ms.WriteArray(q);
sentSync.Enqueue(s);

20
OpenRA.Game/Network/GameSave.cs
View File

@@ -226,9 +226,9 @@ namespace OpenRA.Network
clientSlot = firstBotSlotIndex;
}
ordersStream.WriteArray(BitConverter.GetBytes(data.Length + 8));
ordersStream.WriteArray(BitConverter.GetBytes(frame));
ordersStream.WriteArray(BitConverter.GetBytes(clientSlot));
ordersStream.Write(data.Length + 8);
ordersStream.Write(frame);
ordersStream.Write(clientSlot);
ordersStream.WriteArray(data);
LastOrdersFrame = frame;
}
@@ -288,9 +288,9 @@ namespace OpenRA.Network
{
ordersStream.Seek(0, SeekOrigin.Begin);
ordersStream.CopyTo(file);
file.Write(BitConverter.GetBytes(MetadataMarker), 0, 4);
file.Write(BitConverter.GetBytes(LastOrdersFrame), 0, 4);
file.Write(BitConverter.GetBytes(LastSyncFrame), 0, 4);
file.Write(MetadataMarker);
file.Write(LastOrdersFrame);
file.Write(LastSyncFrame);
file.Write(lastSyncPacket, 0, Order.SyncHashOrderLength);
var globalSettingsNodes = new List<MiniYamlNode>() { GlobalSettings.Serialize() };
@@ -307,16 +307,16 @@ namespace OpenRA.Network
file.WriteString(Encoding.UTF8, slotClientNodes.WriteToString());
var traitDataOffset = file.Length;
file.Write(BitConverter.GetBytes(TraitDataMarker), 0, 4);
file.Write(TraitDataMarker);
var traitDataNodes = TraitData
.Select(kv => new MiniYamlNode(kv.Key.ToStringInvariant(), kv.Value))
.ToList();
file.WriteString(Encoding.UTF8, traitDataNodes.WriteToString());
file.Write(BitConverter.GetBytes(ordersStream.Length), 0, 4);
file.Write(BitConverter.GetBytes(traitDataOffset), 0, 4);
file.Write(BitConverter.GetBytes(EOFMarker), 0, 4);
file.Write((int)ordersStream.Length);
file.Write((int)traitDataOffset);
file.Write(EOFMarker);
}
}
}

8
OpenRA.Game/Network/OrderIO.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Network
public byte[] Serialize(int frame)
{
var ms = new MemoryStream((int)data.Length + 4);
ms.WriteArray(BitConverter.GetBytes(frame));
ms.Write(frame);
data.Position = 0;
data.CopyTo(ms);
@@ -83,9 +83,9 @@ namespace OpenRA.Network
public static byte[] SerializeSync((int Frame, int SyncHash, ulong DefeatState) data)
{
var ms = new MemoryStream(4 + Order.SyncHashOrderLength);
ms.WriteArray(BitConverter.GetBytes(data.Frame));
ms.Write(data.Frame);
ms.WriteByte((byte)OrderType.SyncHash);
ms.WriteArray(BitConverter.GetBytes(data.SyncHash));
ms.Write(data.SyncHash);
ms.WriteArray(BitConverter.GetBytes(data.DefeatState));
return ms.GetBuffer();
}
@@ -93,7 +93,7 @@ namespace OpenRA.Network
public static byte[] SerializePingResponse(long timestamp, byte queueLength)
{
var ms = new MemoryStream(14);
ms.WriteArray(BitConverter.GetBytes(0));
ms.Write(0);
ms.WriteByte((byte)OrderType.Ping);
ms.WriteArray(BitConverter.GetBytes(timestamp));
ms.WriteByte(queueLength);

2
OpenRA.Game/Network/ReplayRecorder.cs
View File

@@ -92,7 +92,7 @@ namespace OpenRA.Network
public void ReceiveFrame(int clientID, int frame, byte[] data)
{
var ms = new MemoryStream(4 + data.Length);
ms.WriteArray(BitConverter.GetBytes(frame));
ms.Write(frame);
ms.WriteArray(data);
Receive(clientID, ms.GetBuffer());
}

6
OpenRA.Game/Server/Connection.cs
View File

@@ -60,9 +60,9 @@ namespace OpenRA.Server
static byte[] CreatePingFrame()
{
var ms = new MemoryStream(21);
ms.WriteArray(BitConverter.GetBytes(13));
ms.WriteArray(BitConverter.GetBytes(0));
ms.WriteArray(BitConverter.GetBytes(0));
ms.Write(13);
ms.Write(0);
ms.Write(0);
ms.WriteByte((byte)OrderType.Ping);
ms.WriteArray(BitConverter.GetBytes(Game.RunTime));
return ms.GetBuffer();

22
OpenRA.Game/Server/Server.cs
View File

@@ -436,8 +436,8 @@ namespace OpenRA.Server
{
// Send handshake and client index.
var ms = new MemoryStream(8);
ms.WriteArray(BitConverter.GetBytes(ProtocolVersion.Handshake));
ms.WriteArray(BitConverter.GetBytes(newConn.PlayerIndex));
ms.Write(ProtocolVersion.Handshake);
ms.Write(newConn.PlayerIndex);
newConn.TrySendData(ms.ToArray());
// Dispatch a handshake order
@@ -704,9 +704,9 @@ namespace OpenRA.Server
static byte[] CreateFrame(int client, int frame, byte[] data)
{
var ms = new MemoryStream(data.Length + 12);
ms.WriteArray(BitConverter.GetBytes(data.Length + 4));
ms.WriteArray(BitConverter.GetBytes(client));
ms.WriteArray(BitConverter.GetBytes(frame));
ms.Write(data.Length + 4);
ms.Write(client);
ms.Write(frame);
ms.WriteArray(data);
return ms.GetBuffer();
}
@@ -714,9 +714,9 @@ namespace OpenRA.Server
static byte[] CreateAckFrame(int frame, byte count)
{
var ms = new MemoryStream(14);
ms.WriteArray(BitConverter.GetBytes(6));
ms.WriteArray(BitConverter.GetBytes(0));
ms.WriteArray(BitConverter.GetBytes(frame));
ms.Write(6);
ms.Write(0);
ms.Write(frame);
ms.WriteByte((byte)OrderType.Ack);
ms.WriteByte(count);
return ms.GetBuffer();
@@ -725,9 +725,9 @@ namespace OpenRA.Server
static byte[] CreateTickScaleFrame(float scale)
{
var ms = new MemoryStream(17);
ms.WriteArray(BitConverter.GetBytes(9));
ms.WriteArray(BitConverter.GetBytes(0));
ms.WriteArray(BitConverter.GetBytes(0));
ms.Write(9);
ms.Write(0);
ms.Write(0);
ms.WriteByte((byte)OrderType.TickScale);
ms.Write(scale);
return ms.GetBuffer();