Remove Map.SpawnPoints.

OpenRA.Mods.Common/Lint/CheckPlayers.cs

@@ -10,6 +10,7 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
@@ -46,14 +47,18 @@ namespace OpenRA.Mods.Common.Lint
 
 			if (worldActor.HasTraitInfo<MPStartLocationsInfo>())
 			{
-				var multiPlayers = players.Count(p => p.Value.Playable);
-				var spawns = map.ActorDefinitions.Where(a => a.Value.Value == "mpspawn");
-				var spawnCount = spawns.Count();
+				var playerCount = players.Count(p => p.Value.Playable);
+				var spawns = new List<CPos>();
+				foreach (var kv in map.ActorDefinitions.Where(d => d.Value.Value == "mpspawn"))
+				{
+					var s = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
+					spawns.Add(s.InitDict.Get<LocationInit>().Value(null));
+				}
 
-				if (multiPlayers > spawnCount)
-					emitError("The map allows {0} possible players, but defines only {1} spawn points".F(multiPlayers, spawnCount));
+				if (playerCount > spawns.Count)
+					emitError("The map allows {0} possible players, but defines only {1} spawn points".F(playerCount, spawns.Count));
 
-				if (map.SpawnPoints.Value.Distinct().Count() != spawnCount)
+				if (spawns.Distinct().Count() != spawns.Count)
 					emitError("Duplicate spawn point locations detected.");
 			}
 

OpenRA.Mods.Common/Traits/World/MPStartLocations.cs

@@ -38,7 +38,10 @@ namespace OpenRA.Mods.Common.Traits
 
 		public void WorldLoaded(World world, WorldRenderer wr)
 		{
-			var spawns = world.Map.SpawnPoints.Value;
+			var spawns = world.Actors.Where(a => a.Info.Name == "mpspawn")
+				.Select(a => a.Location)
+				.ToArray();
+
 			var taken = world.LobbyInfo.Clients.Where(c => c.SpawnPoint != 0 && c.Slot != null)
 					.Select(c => spawns[c.SpawnPoint - 1]).ToList();
 			var available = spawns.Except(taken).ToList();

OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs

@@ -35,6 +35,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		public Map Map;
 		public List<string> Players = new List<string>();
 		public MapPlayers MapPlayers;
+		int spawnCount;
 
 		public bool ValidateArguments(string[] args)
 		{
@@ -81,12 +82,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
 				LoadSmudges(file, "SMUDGE");
 
 				var waypoints = file.GetSection("Waypoints");
-				LoadWaypoints(Map, waypoints, MapSize);
+				LoadWaypoints(waypoints);
 
 				// Create default player definitions only if there are no players to import
-				MapPlayers = new MapPlayers(Map.Rules, (Players.Count == 0) ? Map.SpawnPoints.Value.Length : 0);
+				MapPlayers = new MapPlayers(Map.Rules, Players.Count == 0 ? spawnCount : 0);
 				foreach (var p in Players)
 					LoadPlayer(file, p);
+
 				Map.PlayerDefinitions = MapPlayers.ToMiniYaml();
 			}
 
@@ -235,13 +237,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			return new int2(offset % mapSize, offset / mapSize);
 		}
 
-		static void LoadWaypoints(Map map, IniSection waypointSection, int mapSize)
+		void LoadWaypoints(IniSection waypointSection)
 		{
-			var actorCount = map.ActorDefinitions.Count;
+			var actorCount = Map.ActorDefinitions.Count;
 			var wps = waypointSection
 				.Where(kv => Exts.ParseIntegerInvariant(kv.Value) > 0)
 				.Select(kv => Pair.New(Exts.ParseIntegerInvariant(kv.Key),
-					LocationFromMapOffset(Exts.ParseIntegerInvariant(kv.Value), mapSize)));
+					LocationFromMapOffset(Exts.ParseIntegerInvariant(kv.Value), MapSize)));
 
 			// Add waypoint actors
 			foreach (var kv in wps)
@@ -254,7 +256,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						new OwnerInit("Neutral")
 					};
 
-					map.ActorDefinitions.Add(new MiniYamlNode("Actor" + actorCount++, ar.Save()));
+					Map.ActorDefinitions.Add(new MiniYamlNode("Actor" + actorCount++, ar.Save()));
+					spawnCount++;
 				}
 				else
 				{
@@ -264,7 +267,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						new OwnerInit("Neutral")
 					};
 
-					map.ActorDefinitions.Add(new MiniYamlNode("waypoint" + kv.First, ar.Save()));
+					Map.ActorDefinitions.Add(new MiniYamlNode("waypoint" + kv.First, ar.Save()));
 				}
 			}
 		}

OpenRA.Mods.Common/Widgets/Logic/Editor/NewMapLogic.cs

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				var br = new PPos(width, height + maxTerrainHeight);
 				map.SetBounds(tl, br);
 
-				map.PlayerDefinitions = new MapPlayers(map.Rules, map.SpawnPoints.Value.Length).ToMiniYaml();
+				map.PlayerDefinitions = new MapPlayers(map.Rules, 0).ToMiniYaml();
 				map.FixOpenAreas();
 
 				Action<string> afterSave = uid =>