Merge remote branch 'beedee/master'

2010-02-16 20:04:52 +13:00
parent 8d22e23cae 8b83677944
commit 90b6d69e8c
3 changed files with 4 additions and 6 deletions
--- a/OpenRa.Game/Traits/World/CrateSpawner.cs
+++ b/OpenRa.Game/Traits/World/CrateSpawner.cs
@@ -43,7 +43,7 @@ namespace OpenRa.Traits
 		{
 			var inWater = self.World.SharedRandom.NextDouble() < info.WaterChance;
 			var umt = inWater ? UnitMovementType.Float : UnitMovementType.Wheel;
-
+			int count = 0, threshold = 100;
 			for (; ; )
 			{
 				var p = new int2(self.World.SharedRandom.Next(0, 127), self.World.SharedRandom.Next(0, 127));
@@ -53,6 +53,8 @@ namespace OpenRa.Traits
 						w => crates.Add(w.CreateActor("crate", p, self.Owner)));
 					break;
 				}
+				if (count++ > threshold)
+					break;
 			}
 		}
 	}