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

Fix the switch-case formatting in Order.Deserialize

Browse Source
This commit is contained in:
abcdefg30
2022-06-24 16:11:34 +02:00
committed by teinarss
parent c15af9f68a
commit 13145557c8
1 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,47 +117,48 @@ namespace OpenRA
switch ((TargetType)r.ReadByte()) switch ((TargetType)r.ReadByte())
{ {
case TargetType.Actor: case TargetType.Actor:
{ {
if (world != null && TryGetActorFromUInt(world, r.ReadUInt32(), out var targetActor)) if (world != null && TryGetActorFromUInt(world, r.ReadUInt32(), out var targetActor))
target = Target.FromActor(targetActor); target = Target.FromActor(targetActor);
break;
} break;
}
case TargetType.FrozenActor: case TargetType.FrozenActor:
{ {
var playerActorID = r.ReadUInt32(); var playerActorID = r.ReadUInt32();
var frozenActorID = r.ReadUInt32(); var frozenActorID = r.ReadUInt32();
if (world == null || !TryGetActorFromUInt(world, playerActorID, out var playerActor))
break;
if (playerActor.Owner.FrozenActorLayer == null)
break;
var frozen = playerActor.Owner.FrozenActorLayer.FromID(frozenActorID);
if (frozen != null)
target = Target.FromFrozenActor(frozen);
if (world == null || !TryGetActorFromUInt(world, playerActorID, out var playerActor))
break; break;
}
if (playerActor.Owner.FrozenActorLayer == null)
break;
var frozen = playerActor.Owner.FrozenActorLayer.FromID(frozenActorID);
if (frozen != null)
target = Target.FromFrozenActor(frozen);
break;
}
case TargetType.Terrain: case TargetType.Terrain:
{
if (flags.HasField(OrderFields.TargetIsCell))
{ {
if (flags.HasField(OrderFields.TargetIsCell)) var cell = new CPos(r.ReadInt32());
{ var subCell = (SubCell)r.ReadByte();
var cell = new CPos(r.ReadInt32()); if (world != null)
var subCell = (SubCell)r.ReadByte(); target = Target.FromCell(world, cell, subCell);
if (world != null)
target = Target.FromCell(world, cell, subCell);
}
else
{
var pos = new WPos(r.ReadInt32(), r.ReadInt32(), r.ReadInt32());
target = Target.FromPos(pos);
}
break;
} }
else
{
var pos = new WPos(r.ReadInt32(), r.ReadInt32(), r.ReadInt32());
target = Target.FromPos(pos);
}
break;
}
} }
} }