diff --git a/OpenRA.Game/Graphics/SequenceProvider.cs b/OpenRA.Game/Graphics/SequenceProvider.cs index d85a7cc484..74466affe6 100644 --- a/OpenRA.Game/Graphics/SequenceProvider.cs +++ b/OpenRA.Game/Graphics/SequenceProvider.cs @@ -49,10 +49,10 @@ namespace OpenRA.Graphics public void ActivateMap(Map map) { - sequences = Load(modData.Manifest.Sequences, map.Sequences); + sequences = Load(modData.Manifest.Sequences, map.Tileset, map.Sequences); } - public Dictionary>> Load(string[] sequenceFiles, List sequenceNodes) + public Dictionary>> Load(string[] sequenceFiles, string tileset, List sequenceNodes) { Game.modData.LoadScreen.Display(); @@ -63,7 +63,10 @@ namespace OpenRA.Graphics var items = new Dictionary>>(); foreach (var node in nodes) { - var key = node.Value.ToLines(node.Key).JoinWith("|"); + // Sequence loading uses the active SpriteLoader that depends on the current map's tileset + + var key = tileset + node.Value.ToLines(node.Key).JoinWith("|"); + Lazy> t; if (sequenceCache.TryGetValue(key, out t)) {