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

Steam and Gog resolvers now take IDFiles into account.

Browse Source
This commit is contained in:
IceReaper
2023-03-30 12:27:31 +02:00
committed by Matthias Mailänder
parent 56c0680685
commit d97df78f4f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Installer/SourceResolvers/GogSourceResolver.cs
View File

@@ -34,8 +34,13 @@ namespace OpenRA.Mods.Common.Installer
var prefixes = new[] { "HKEY_LOCAL_MACHINE\\Software\\", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\" }; var prefixes = new[] { "HKEY_LOCAL_MACHINE\\Software\\", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\" };
foreach (var prefix in prefixes) foreach (var prefix in prefixes)
if (Registry.GetValue($"{prefix}GOG.com\\Games\\{appId.Value}", "path", null) is string installDir) {
if (!(Registry.GetValue($"{prefix}GOG.com\\Games\\{appId.Value}", "path", null) is string installDir))
continue;
if (InstallerUtils.IsValidSourcePath(installDir, modSource))
return installDir; return installDir;
}
return null; return null;
} }

9
OpenRA.Mods.Common/Installer/SourceResolvers/SteamSourceResolver.cs
View File

@@ -43,8 +43,13 @@ namespace OpenRA.Mods.Common.Installer
if (!data.TryGetValue("installdir", out var installDir)) if (!data.TryGetValue("installdir", out var installDir))
continue; continue;
if (installDir != null) if (installDir == null)
return Path.Combine(steamDirectory, "steamapps", "common", installDir); continue;
var path = Path.Combine(steamDirectory, "steamapps", "common", installDir);
if (InstallerUtils.IsValidSourcePath(path, modSource))
return path;
} }
return null; return null;