MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Add Command Line Parameter to Override Mods #499

Closed
TheMetalStorm wants to merge 4 commits from cli-mods into master
pull from: cli-mods
merge into: MeloNX:master
Conversation 1 Commits 4 Files Changed 6 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8827bce223 - Show all commits

4
src/Ryujinx.Common/Configuration/AppDataManager.cs
View File

@ -32,7 +32,7 @@ namespace Ryujinx.Common.Configuration
public static string KeysDirPathUser { get; }
public static string LogsDirPath { get; private set; }
public static string[] CommandLineArgMods { get; private set; }
public static string[] OverrideMods { get; private set; }
public const string DefaultNandDir = "bis";
public const string DefaultSdcardDir = "sdcard";
@ -50,7 +50,7 @@ namespace Ryujinx.Common.Configuration
public static void Initialize(string baseDirPath, string[] commandLineArgMods)
{
CommandLineArgMods = commandLineArgMods;
OverrideMods = commandLineArgMods;
string appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
if (appDataPath.Length == 0)

8
src/Ryujinx.HLE/HOS/ModLoader.cs
View File

@ -171,13 +171,13 @@ namespace Ryujinx.HLE.HOS
var modData = modMetadata.Mods.FirstOrDefault(x => modDir.FullName.Contains(x.Path));
bool enabled;
if (AppDataManager.CommandLineArgMods.Length == 0)
if (AppDataManager.OverrideMods.Length == 0)
{
enabled = modData?.Enabled ?? true;
}
else
{
enabled = AppDataManager.CommandLineArgMods.Contains(modData.Name);
enabled = AppDataManager.OverrideMods.Contains(modData.Name);
}
mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled));
@ -188,13 +188,13 @@ namespace Ryujinx.HLE.HOS
var modData = modMetadata.Mods.FirstOrDefault(x => modDir.FullName.Contains(x.Path));
bool enabled;
if (AppDataManager.CommandLineArgMods.Length == 0)
if (AppDataManager.OverrideMods.Length == 0)
{
enabled = modData?.Enabled ?? true;
}
else
{
enabled = AppDataManager.CommandLineArgMods.Contains(modData.Name);
enabled = AppDataManager.OverrideMods.Contains(modData.Name);
}
mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled));