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

Fix terrain positions for targets not being serialized for Orders

Browse Source
This commit is contained in:
abcdefg30
2022-08-13 15:08:13 +02:00
committed by Gustas
parent 29eaab59be
commit e41279fe6b
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,18 @@ namespace OpenRA
else else
{ {
var pos = new WPos(r.ReadInt32(), r.ReadInt32(), r.ReadInt32()); var pos = new WPos(r.ReadInt32(), r.ReadInt32(), r.ReadInt32());
target = Target.FromPos(pos);
var numberOfTerrainPositions = r.ReadByte();
if (numberOfTerrainPositions == 0)
target = Target.FromPos(pos);
else
{
var terrainPositions = new WPos[numberOfTerrainPositions];
for (var i = 0; i < numberOfTerrainPositions; i++)
terrainPositions[i] = new WPos(r.ReadInt32(), r.ReadInt32(), r.ReadInt32());
target = Target.FromSerializedTerrainPosition(pos, terrainPositions);
}
} }
break; break;
@@ -388,6 +399,21 @@ namespace OpenRA
w.Write(targetState.Pos.X); w.Write(targetState.Pos.X);
w.Write(targetState.Pos.Y); w.Write(targetState.Pos.Y);
w.Write(targetState.Pos.Z); w.Write(targetState.Pos.Z);
// Don't send extra data over the network that will be restored by the Target ctor
var terrainPositions = targetState.TerrainPositions.Length;
if (terrainPositions == 1 && targetState.TerrainPositions[0] == targetState.Pos)
w.Write((byte)0);
else
{
w.Write((byte)terrainPositions);
foreach (var position in targetState.TerrainPositions)
{
w.Write(position.X);
w.Write(position.Y);
w.Write(position.Z);
}
}
} }
break; break;

2
OpenRA.Game/Server/ProtocolVersion.cs
View File

@@ -77,6 +77,6 @@ namespace OpenRA.Server
// The protocol for server and world orders // The protocol for server and world orders
// This applies after the handshake has completed, and is provided to support // This applies after the handshake has completed, and is provided to support
// alternative server implementations that wish to support multiple versions in parallel // alternative server implementations that wish to support multiple versions in parallel
public const int Orders = 20; public const int Orders = 21;
} }
} }

5
OpenRA.Game/Traits/Target.cs
View File

@@ -288,7 +288,8 @@ namespace OpenRA.Traits
// Expose internal state for serialization by the orders code *only* // Expose internal state for serialization by the orders code *only*
internal static Target FromSerializedActor(Actor a, int generation) { return a != null ? new Target(a, generation) : Invalid; } internal static Target FromSerializedActor(Actor a, int generation) { return a != null ? new Target(a, generation) : Invalid; }
internal (TargetType Type, Actor Actor, int Generation, CPos? Cell, SubCell? SubCell, WPos Pos) SerializableState => internal static Target FromSerializedTerrainPosition(WPos centerPosition, WPos[] terrainPositions) { return new Target(centerPosition, terrainPositions); }
(type, Actor, generation, cell, subCell, terrainCenterPosition); internal (TargetType Type, Actor Actor, int Generation, CPos? Cell, SubCell? SubCell, WPos Pos, WPos[] TerrainPositions) SerializableState =>
(type, Actor, generation, cell, subCell, terrainCenterPosition, terrainPositions);
} }
} }