From 97fdedac4faf969456df45fbde7bd01a564c8cb4 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 2 Jan 2010 12:37:18 +1300
Subject: [PATCH] merge duplication in PlaceBuildingOrderGenerator

---
 OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs b/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
index 0741eae80a..43bf7be963 100644
--- a/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
+++ b/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
@@ -25,13 +25,8 @@ namespace OpenRa.Game.Orders
 
 			if (mi.Button == MouseButton.Left)
 			{
-				if (!Game.CanPlaceBuilding(Building, xy, null, true))
-				{
-					Sound.Play("nodeply1.aud");
-					yield break;
-				}
-
-				if (!Game.IsCloseEnoughToBase(Producer.Owner, Building, xy))
+				if (!Game.CanPlaceBuilding(Building, xy, null, true)
+					|| !Game.IsCloseEnoughToBase(Producer.Owner, Building, xy))
 				{
 					Sound.Play("nodeply1.aud");
 					yield break;