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

Move advanced map yaml to their own files.

Browse Source
This commit is contained in:
Paul Chote
2016-02-22 20:59:14 +00:00
parent e313ce62f0
commit b969d61466
9 changed files with 108 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/ModData.cs
View File

@@ -130,9 +130,8 @@ namespace OpenRA
return;
}
var yaml = MiniYaml.Merge(Manifest.Translations
.Select(t => MiniYaml.FromStream(ModFiles.Open(t)))
.Append(map.TranslationDefinitions));
var yaml = MiniYaml.Merge(Manifest.Translations.Append(map.TranslationDefinitions)
.Select(t => MiniYaml.FromStream(map.Open(t))));
Languages = yaml.Select(t => t.Key).ToArray();
foreach (var y in yaml)
@@ -183,7 +182,7 @@ namespace OpenRA
foreach (var entry in map.Rules.Music)
entry.Value.Load(map);
VoxelProvider.Initialize(VoxelLoader, map, Manifest.VoxelSequences, map.VoxelSequenceDefinitions);
VoxelProvider.Initialize(VoxelLoader, map, Manifest.VoxelSequences.Append(map.VoxelSequenceDefinitions));
VoxelLoader.Finish();
return map;