From d826cd6247bb5d915bdb5873bfe09151245c66ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 25 Apr 2016 07:28:46 +0200 Subject: [PATCH 1/2] Fix case issues like Temperat vs TEMPERAT during map import. --- OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs index b93b1bc0da..762339c121 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs @@ -60,7 +60,8 @@ namespace OpenRA.Mods.Common.UtilityCommands var format = GetMapFormatVersion(basic); ValidateMapFormat(format); - var tileset = GetTileset(mapSection); + // The original game isn't case sensitive, but we are. + var tileset = GetTileset(mapSection).ToUpperInvariant(); Map = new Map(modData, modData.DefaultTileSets[tileset], MapSize, MapSize) { Title = basic.GetValue("Name", Path.GetFileNameWithoutExtension(filename)), From d4fdb97c35bf5bb9063aa7b449bd163776cbc33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 1 May 2016 12:19:19 +0200 Subject: [PATCH 2/2] Throw with a less generic KeyNotFoundException on error. --- OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs index 762339c121..8e0cd6112a 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs @@ -62,6 +62,9 @@ namespace OpenRA.Mods.Common.UtilityCommands // The original game isn't case sensitive, but we are. var tileset = GetTileset(mapSection).ToUpperInvariant(); + if (!modData.DefaultTileSets.ContainsKey(tileset)) + throw new InvalidDataException("Unknown tileset {0}".F(tileset)); + Map = new Map(modData, modData.DefaultTileSets[tileset], MapSize, MapSize) { Title = basic.GetValue("Name", Path.GetFileNameWithoutExtension(filename)),