From a3af1d91ccb2271b1eeffb974e8386af7d713ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jun 2016 11:53:26 +0200 Subject: [PATCH] Don't add mpspawns when importing single-player maps. --- .../UtilityCommands/ImportLegacyMapCommand.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs index 4a84c92d43..ae3dfaf712 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs @@ -35,6 +35,7 @@ namespace OpenRA.Mods.Common.UtilityCommands public Map Map; public List Players = new List(); public MapPlayers MapPlayers; + bool singlePlayer; int spawnCount; public bool ValidateArguments(string[] args) @@ -55,6 +56,11 @@ namespace OpenRA.Mods.Common.UtilityCommands { var file = new IniFile(stream); var basic = file.GetSection("Basic"); + + var player = basic.GetValue("Player", string.Empty); + if (!string.IsNullOrEmpty(player)) + singlePlayer = !player.StartsWith("Multi"); + var mapSection = file.GetSection("Map"); var format = GetMapFormatVersion(basic); @@ -252,7 +258,7 @@ namespace OpenRA.Mods.Common.UtilityCommands // Add waypoint actors foreach (var kv in wps) { - if (kv.First <= 7) + if (!singlePlayer && kv.First <= 7) { var ar = new ActorReference("mpspawn") {