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

Remove redundant switch from order serialization.

Browse Source
This commit is contained in:
Paul Chote
2017-12-17 11:07:06 +00:00
committed by abcdefg30
parent 987d0b77ac
commit 9c88fc154f
1 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Network/Order.cs
View File

@@ -238,28 +238,25 @@ namespace OpenRA
public byte[] Serialize() public byte[] Serialize()
{ {
var minLength = OrderString.Length + 1 + (IsImmediate ? 1 + TargetString.Length + 1 : 6);
var ret = new MemoryStream(minLength);
var w = new BinaryWriter(ret);
if (IsImmediate) if (IsImmediate)
{ {
var ret = new MemoryStream(1 + OrderString.Length + 1 + TargetString.Length + 1); w.Write((byte)0xFE);
var w = new BinaryWriter(ret);
w.Write((byte)0xfe);
w.Write(OrderString); w.Write(OrderString);
w.Write(TargetString); w.Write(TargetString);
return ret.ToArray(); return ret.ToArray();
} }
switch (OrderString)
{
/* /*
* Format: * Format:
* u8: orderID. * u8: orderID.
* 0xFF: Full serialized order. * 0xFF: Full serialized order.
* varies: rest of order. * varies: rest of order.
*/ */
default:
{
var ret = new MemoryStream();
var w = new BinaryWriter(ret);
w.Write((byte)0xFF); w.Write((byte)0xFF);
w.Write(OrderString); w.Write(OrderString);
w.Write(UIntFromActor(Subject)); w.Write(UIntFromActor(Subject));
@@ -302,8 +299,6 @@ namespace OpenRA
return ret.ToArray(); return ret.ToArray();
} }
}
}
public override string ToString() public override string ToString()
{ {