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

Fix gen1 map importer crashing on invalid tiles

Browse Source
This commit is contained in:
Gustas
2023-08-06 08:56:24 +03:00
committed by Matthias Mailänder
parent 9d79e52989
commit e49135bb09
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Cnc/UtilityCommands/ImportGen1MapCommand.cs
View File

@@ -103,6 +103,8 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
if (Map.Rules.TerrainInfo is ITerrainInfoNotifyMapCreated notifyMapCreated) if (Map.Rules.TerrainInfo is ITerrainInfoNotifyMapCreated notifyMapCreated)
notifyMapCreated.MapCreated(Map); notifyMapCreated.MapCreated(Map);
ReplaceInvalidTerrainTiles(Map);
var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap"; var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
Map.Save(ZipFileLoader.Create(dest)); Map.Save(ZipFileLoader.Create(dest));
@@ -159,6 +161,19 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
missionData.Value.Nodes.Add(new MiniYamlNode("Briefing", briefing.Replace("\n", " ").ToString())); missionData.Value.Nodes.Add(new MiniYamlNode("Briefing", briefing.Replace("\n", " ").ToString()));
} }
static void ReplaceInvalidTerrainTiles(Map map)
{
var terrainInfo = map.Rules.TerrainInfo;
foreach (var uv in map.AllCells.MapCoords)
{
if (!terrainInfo.TryGetTerrainInfo(map.Tiles[uv], out _))
{
map.Tiles[uv] = terrainInfo.DefaultTerrainTile;
Console.WriteLine($"Replaced invalid terrain tile at {uv}");
}
}
}
static void SetBounds(Map map, IniSection mapSection) static void SetBounds(Map map, IniSection mapSection)
{ {
var offsetX = Exts.ParseIntegerInvariant(mapSection.GetValue("X", "0")); var offsetX = Exts.ParseIntegerInvariant(mapSection.GetValue("X", "0"));