Provide the manifest to IFileSystemLoader.Mount.
This commit is contained in:
committed by
Gustas Kažukauskas
parent
2246922118
commit
de952e6caf
@@ -65,7 +65,7 @@ namespace OpenRA
|
||||
|
||||
FileSystemLoader = ObjectCreator.GetLoader<IFileSystemLoader>(Manifest.FileSystem.Value, "filesystem");
|
||||
FieldLoader.Load(FileSystemLoader, Manifest.FileSystem);
|
||||
FileSystemLoader.Mount(ModFiles, ObjectCreator);
|
||||
FileSystemLoader.Mount(Manifest, ModFiles, ObjectCreator);
|
||||
ModFiles.TrimExcess();
|
||||
|
||||
foreach (var kv in Manifest.GlobalModData)
|
||||
@@ -253,6 +253,6 @@ namespace OpenRA
|
||||
|
||||
public interface IFileSystemLoader
|
||||
{
|
||||
void Mount(FS fileSystem, ObjectCreator objectCreator);
|
||||
void Mount(Manifest manifest, FS fileSystem, ObjectCreator objectCreator);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.FileSystem
|
||||
return packages.ToImmutableArray();
|
||||
}
|
||||
|
||||
public void Mount(OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectCreator)
|
||||
public void Mount(Manifest manifest, OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectCreator)
|
||||
{
|
||||
foreach (var kv in SystemPackages)
|
||||
fileSystem.Mount(kv.Key, kv.Value);
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.FileSystem
|
||||
return packages.ToImmutableArray();
|
||||
}
|
||||
|
||||
public void Mount(OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectCreator)
|
||||
public void Mount(Manifest manifest, OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectCreator)
|
||||
{
|
||||
if (Packages != null)
|
||||
foreach (var kv in Packages)
|
||||
|
||||
Reference in New Issue
Block a user