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

Rename Image -> Images.

Browse Source
This commit is contained in:
Paul Chote
2015-03-30 20:18:22 +01:00
parent 4be5334a0e
commit 84e85d8a5d
20 changed files with 3587 additions and 3583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,17 +54,17 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var ext in exts)
{
Stream s;
if (!GlobalFileSystem.TryOpen(template.Image[0] + ext, out s))
if (!GlobalFileSystem.TryOpen(template.Images[0] + ext, out s))
continue;
// Rewrite the template image (normally readonly) using reflection
imageField.SetValue(template, template.Image[0] + ext);
imageField.SetValue(template, template.Images[0] + ext);
// Fetch the private tileInfo array so that we can write new entries
var tileInfo = (TerrainTileInfo[])tileInfoField.GetValue(template);
// Open the file and search for any implicit frames
var allFrames = frameCache[template.Image[0]];
var allFrames = frameCache[template.Images[0]];
var frames = template.Frames != null ? template.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
// Resize array for new entries
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
terrainTypeField.SetValue(tileInfo[i], ti);
terrainLeftColorField.SetValue(tileInfo[i], ts[ti].Color);
terrainRightColorField.SetValue(tileInfo[i], ts[ti].Color);
Console.WriteLine("Fixing entry for {0}:{1}", template.Image[0], i);
Console.WriteLine("Fixing entry for {0}:{1}", template.Images[0], i);
}
}

4
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -1238,6 +1238,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
addNodes.Add(new MiniYamlNode("TargetTypes", node.Value.Value == "Water" ? "Water" : "Ground"));
}
if (engineVersion < 20150330)
if (depth == 2 && node.Key == "Image")
node.Key = "Images";
UpgradeTileset(engineVersion, ref node.Value.Nodes, node, depth + 1);
}