Allow each caller on MergeOrDefault to discard nodes.

Use filtering ActorInfo's to drop template actors.
This commit is contained in:
Peter Antal
2018-02-25 22:29:49 -08:00
committed by abcdefg30
parent 40d7b41e84
commit d2ff5b49fd
9 changed files with 24 additions and 26 deletions

View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine("Tileset: " + ts.Name);
var sc = new SpriteCache(modData.DefaultFileSystem, modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed));
var nodes = MiniYaml.Merge(modData.Manifest.Sequences.Select(s => MiniYaml.FromStream(modData.DefaultFileSystem.Open(s), s)));
foreach (var n in nodes.Where(node => !node.Key.StartsWith("^")))
foreach (var n in nodes.Where(node => !node.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal)))
modData.SpriteSequenceLoader.ParseSequences(modData, ts, sc, n);
}