From 13145557c85f0407c35460fe30c0f0c190fbb263 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Fri, 24 Jun 2022 16:11:34 +0200 Subject: [PATCH] Fix the switch-case formatting in Order.Deserialize --- OpenRA.Game/Network/Order.cs | 67 ++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/OpenRA.Game/Network/Order.cs b/OpenRA.Game/Network/Order.cs index cb75fe70dd..2f4049c0dd 100644 --- a/OpenRA.Game/Network/Order.cs +++ b/OpenRA.Game/Network/Order.cs @@ -117,47 +117,48 @@ namespace OpenRA switch ((TargetType)r.ReadByte()) { case TargetType.Actor: - { - if (world != null && TryGetActorFromUInt(world, r.ReadUInt32(), out var targetActor)) - target = Target.FromActor(targetActor); - break; - } + { + if (world != null && TryGetActorFromUInt(world, r.ReadUInt32(), out var targetActor)) + target = Target.FromActor(targetActor); + + break; + } case TargetType.FrozenActor: - { - var playerActorID = 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); + { + var playerActorID = 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); + + break; + } case TargetType.Terrain: + { + if (flags.HasField(OrderFields.TargetIsCell)) { - if (flags.HasField(OrderFields.TargetIsCell)) - { - var cell = new CPos(r.ReadInt32()); - var subCell = (SubCell)r.ReadByte(); - 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; + var cell = new CPos(r.ReadInt32()); + var subCell = (SubCell)r.ReadByte(); + 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; + } } }