more cleanup

OpenRA.Editor/ActorTool.cs

@@ -34,12 +34,22 @@ public void Apply(Surface surface)
 				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;
+			}
+		}
 	}
 }

OpenRA.Editor/ResourceTool.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using OpenRA.FileFormats;
 
 using SGraphics = System.Drawing.Graphics;
@@ -26,7 +27,7 @@ public void Apply(Surface surface)
 				= new TileReference<byte, byte>
 				{
 					type = (byte)Resource.Info.ResourceType,
-					index = (byte)surface.random.Next(Resource.Info.SpriteNames.Length),
+					index = (byte)random.Next(Resource.Info.SpriteNames.Length),
 					image = (byte)Resource.Value
 				};
 
@@ -44,5 +45,7 @@ public void Preview(Surface surface, SGraphics g)
 		{
 			surface.DrawImage(g, Resource.Bitmap, surface.GetBrushLocation());
 		}
+
+		Random random = new Random();
 	}
 }

OpenRA.Editor/Surface.cs

@@ -186,25 +186,6 @@ void Erase()
 		void Draw()
 		{
 			if (Tool != null) Tool.Apply(this);
-
-			AfterChange();
-		}
-
-		int id;
-		public string NextActorName()
-		{
-			for (; ; )
-			{
-				var possible = "Actor{0}".F(id++);
-				if (!Map.Actors.ContainsKey(possible)) return possible;
-			}
-		}
-
-		public System.Random random = new System.Random();
-		void DrawWithResource()
-		{
-
-
 			AfterChange();
 		}