From de952e6cafe4388efd298ad54e27b74032eff176 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 23 Dec 2025 17:07:07 +0000 Subject: [PATCH] Provide the manifest to IFileSystemLoader.Mount. --- OpenRA.Game/ModData.cs | 4 ++-- .../FileSystem/ContentInstallerFileSystemLoader.cs | 2 +- OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs index 0f44377078..a267e57948 100644 --- a/OpenRA.Game/ModData.cs +++ b/OpenRA.Game/ModData.cs @@ -65,7 +65,7 @@ namespace OpenRA FileSystemLoader = ObjectCreator.GetLoader(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); } } diff --git a/OpenRA.Mods.Common/FileSystem/ContentInstallerFileSystemLoader.cs b/OpenRA.Mods.Common/FileSystem/ContentInstallerFileSystemLoader.cs index 3df6c8c950..548d4dab1b 100644 --- a/OpenRA.Mods.Common/FileSystem/ContentInstallerFileSystemLoader.cs +++ b/OpenRA.Mods.Common/FileSystem/ContentInstallerFileSystemLoader.cs @@ -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); diff --git a/OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs b/OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs index 3f0d8983d0..c89106202e 100644 --- a/OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs +++ b/OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs @@ -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)