epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add mpspawns when importing single-player maps.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-06-05 11:53:26 +02:00
parent e70b27f857
commit a3af1d91cc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
View File

@@ -35,6 +35,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
public Map Map; public Map Map;
public List<string> Players = new List<string>(); public List<string> Players = new List<string>();
public MapPlayers MapPlayers; public MapPlayers MapPlayers;
bool singlePlayer;
int spawnCount; int spawnCount;
public bool ValidateArguments(string[] args) public bool ValidateArguments(string[] args)
@@ -55,6 +56,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
var file = new IniFile(stream); var file = new IniFile(stream);
var basic = file.GetSection("Basic"); 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 mapSection = file.GetSection("Map");
var format = GetMapFormatVersion(basic); var format = GetMapFormatVersion(basic);
@@ -252,7 +258,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
// Add waypoint actors // Add waypoint actors
foreach (var kv in wps) foreach (var kv in wps)
{ {
if (kv.First <= 7) if (!singlePlayer && kv.First <= 7)
{ {
var ar = new ActorReference("mpspawn") var ar = new ActorReference("mpspawn")
{ {