From 647dc749f0150262478140036f2180ba98d81ff4 Mon Sep 17 00:00:00 2001
From: Igor Popov <ihptru@gmail.com>
Date: Fri, 28 Mar 2014 17:19:49 +0400
Subject: [PATCH] Legacy map import fix spawn slots definition

---
 OpenRA.Utility/LegacyMapImporter.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Utility/LegacyMapImporter.cs b/OpenRA.Utility/LegacyMapImporter.cs
index 30262b8902..aa0c0edf73 100644
--- a/OpenRA.Utility/LegacyMapImporter.cs
+++ b/OpenRA.Utility/LegacyMapImporter.cs
@@ -179,10 +179,20 @@ namespace OpenRA.Utility
 			// Add waypoint actors
 			foreach (var kv in wps)
 			{
-				var a = new ActorReference("waypoint");
-				a.Add(new LocationInit((CPos)kv.Second));
-				a.Add(new OwnerInit("Neutral"));
-				map.Actors.Value.Add("waypoint" + kv.First, a);
+				if (kv.First <= 7)
+				{
+					var a = new ActorReference("mpspawn");
+					a.Add(new LocationInit((CPos)kv.Second));
+					a.Add(new OwnerInit("Neutral"));
+					map.Actors.Value.Add("Actor" + map.Actors.Value.Count.ToString(), a);
+				}
+				else
+				{
+					var a = new ActorReference("waypoint");
+					a.Add(new LocationInit((CPos)kv.Second));
+					a.Add(new OwnerInit("Neutral"));
+					map.Actors.Value.Add("waypoint" + kv.First, a);
+				}
 			}
 		}