From bcf7328d7729d3a1ee6945b53774be01e980183b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 12 Jun 2010 21:48:52 +1200 Subject: [PATCH] a bit of cleanup --- OpenRA.Game/Traits/Player/PlaceBuilding.cs | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/OpenRA.Game/Traits/Player/PlaceBuilding.cs b/OpenRA.Game/Traits/Player/PlaceBuilding.cs index 9e5f76c90e..35a08353e8 100644 --- a/OpenRA.Game/Traits/Player/PlaceBuilding.cs +++ b/OpenRA.Game/Traits/Player/PlaceBuilding.cs @@ -27,38 +27,39 @@ namespace OpenRA.Traits class PlaceBuilding : IResolveOrder { - public void ResolveOrder( Actor self, Order order ) + public void ResolveOrder(Actor self, Order order) { - if( order.OrderString == "PlaceBuilding" || order.OrderString == "LineBuild" ) + if (order.OrderString == "PlaceBuilding" || order.OrderString == "LineBuild") { - self.World.AddFrameEndTask( w => + self.World.AddFrameEndTask(w => { var prevItems = GetNumBuildables(self.Owner); var queue = self.traits.Get(); - var unit = Rules.Info[ order.TargetString ]; + var unit = Rules.Info[order.TargetString]; var producing = queue.CurrentItem(unit.Category); - if( producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0 ) + if (producing == null || producing.Item != order.TargetString || producing.RemainingTime != 0) return; - if( order.OrderString == "LineBuild" ) + var buildingInfo = unit.Traits.Get(); + + if (order.OrderString == "LineBuild") { bool playSounds = true; - var buildingInfo = unit.Traits.Get(); - foreach( var t in LineBuildUtils.GetLineBuildCells( w, order.TargetLocation, order.TargetString, buildingInfo ) ) + foreach (var t in LineBuildUtils.GetLineBuildCells(w, order.TargetLocation, order.TargetString, buildingInfo)) { - var building = w.CreateActor( order.TargetString, t, order.Player ); - if( playSounds ) - foreach( var s in building.Info.Traits.Get().BuildSounds ) - Sound.PlayToPlayer( order.Player, s, building.CenterLocation ); + var building = w.CreateActor(order.TargetString, t, order.Player); + if (playSounds) + foreach (var s in buildingInfo.BuildSounds) + Sound.PlayToPlayer(order.Player, s, building.CenterLocation); playSounds = false; } } else { - var building = w.CreateActor( order.TargetString, order.TargetLocation, order.Player ); - foreach (var s in building.Info.Traits.Get().BuildSounds) + var building = w.CreateActor(order.TargetString, order.TargetLocation, order.Player); + foreach (var s in buildingInfo.BuildSounds) Sound.PlayToPlayer(order.Player, s, building.CenterLocation); } @@ -79,7 +80,7 @@ namespace OpenRA.Traits w.Add(new DelayedAction(10, () => Sound.PlayToPlayer(order.Player, w.WorldActor.Info.Traits.Get().NewOptions))); - } ); + }); } }