emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix exefs mod loading with unpacked games (#1857)

Browse source 
* Add the ability to layeredfs individual exefs with mod loader

* Address code style issues

* Further adjustments to the mod loading

* Update Ryujinx.HLE/HOS/ModLoader.cs

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Apply suggestions from code review

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Address issue with checking for NSO existence (and code style fixes)

Co-authored-by: Ac_K <Acoustik666@gmail.com>
This commit is contained in:
Somebody Whoisbored 2021-01-03 04:30:31 -07:00 committed by GitHub
parent b001040c2f
commit a03ab0c4a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.HLE/HOS/ApplicationLoader.cs
View file

@ -481,11 +481,11 @@ namespace Ryujinx.HLE.HOS
NsoExecutable[] nsos = new NsoExecutable[ExeFsPrefixes.Length]; NsoExecutable[] nsos = new NsoExecutable[ExeFsPrefixes.Length];
for(int i = 0; i < nsos.Length; i++) for (int i = 0; i < nsos.Length; i++)
{ {
string name = ExeFsPrefixes[i]; string name = ExeFsPrefixes[i];
if (!codeFs.FileExists(name)) if (!codeFs.FileExists($"/{name}"))
{ {
continue; // file doesn't exist, skip continue; // file doesn't exist, skip
} }

4
Ryujinx.HLE/HOS/ModLoader.cs
View file

@ -438,9 +438,9 @@ namespace Ryujinx.HLE.HOS
} }
FileInfo npdmFile = new FileInfo(Path.Combine(mod.Path.FullName, "main.npdm")); FileInfo npdmFile = new FileInfo(Path.Combine(mod.Path.FullName, "main.npdm"));
if(npdmFile.Exists) if (npdmFile.Exists)
{ {
if(modLoadResult.Npdm != null) if (modLoadResult.Npdm != null)
{ {
Logger.Warning?.Print(LogClass.ModLoader, "Multiple replacements to 'main.npdm'"); Logger.Warning?.Print(LogClass.ModLoader, "Multiple replacements to 'main.npdm'");