From 446d98e625a4abd6ea9d00d0e7eed23f2645ac94 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 5 Jul 2014 01:28:15 +1200 Subject: [PATCH 1/2] =?UTF-8?q?Support=20ini=20files=20with=20spaces=20aro?= =?UTF-8?q?und=20the=20=E2=80=98=3D=E2=80=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenRA.Game/FileFormats/IniFile.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/FileFormats/IniFile.cs b/OpenRA.Game/FileFormats/IniFile.cs index ee21695592..91b11cff63 100644 --- a/OpenRA.Game/FileFormats/IniFile.cs +++ b/OpenRA.Game/FileFormats/IniFile.cs @@ -81,8 +81,8 @@ namespace OpenRA.FileFormats var eq = line.IndexOf('='); if (eq >= 0) { - key = line.Substring(0, eq); - value = line.Substring(eq + 1, line.Length - eq - 1); + key = line.Substring(0, eq).Trim(); + value = line.Substring(eq + 1, line.Length - eq - 1).Trim(); } if (currentSection == null) From d610c026429dc20a8dc85696a14d73dc4b7f70e3 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 5 Jul 2014 01:29:09 +1200 Subject: [PATCH 2/2] Add an early TS tileset importer and temperate tileset. --- OpenRA.Mods.TS/OpenRA.Mods.TS.csproj | 1 + .../UtilityCommands/LegacyTilesetImporter.cs | 118 + mods/ts/maps/blank-conquest/map.bin | Bin 81925 -> 81925 bytes mods/ts/maps/blank-shellmap/map.bin | Bin 81925 -> 81925 bytes mods/ts/rules/defaults.yaml | 23 +- mods/ts/rules/vehicles.yaml | 6 +- mods/ts/rules/world.yaml | 4 +- mods/ts/tilesets/temperat.yaml | 6610 ++++++++++++++++- 8 files changed, 6741 insertions(+), 21 deletions(-) create mode 100644 OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj index 4dc1e5f23c..d006be2d1d 100644 --- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj +++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj @@ -57,6 +57,7 @@ +