more cleanup

2011-01-30 14:00:10 +13:00
parent 8874b6ef72
commit c3b08a60b8
3 changed files with 15 additions and 21 deletions
--- a/OpenRA.Editor/ActorTool.cs
+++ b/OpenRA.Editor/ActorTool.cs
@@ -34,12 +34,22 @@ namespace OpenRA.Editor
 				return;

 			var owner = "Neutral";
-			var id = surface.NextActorName();
+			var id = NextActorName(surface);
 			surface.Map.Actors[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
 			{
 				new LocationInit( surface.GetBrushLocation() ),
 				new OwnerInit( owner)
 			};
 		}
+
+		string NextActorName(Surface surface)
+		{
+			var id = 0;
+			for (; ; )
+			{
+				var possible = "Actor{0}".F(id++);
+				if (!surface.Map.Actors.ContainsKey(possible)) return possible;
+			}
+		}
 	}
 }