mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
Fix finding Origin games
This commit is contained in:
parent
76a53978ae
commit
e375da6a0c
@ -70,11 +70,9 @@ namespace Wabbajack.Common.StoreHandlers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
foreach (var game in GameRegistry.Games)
|
foreach (var game in GameRegistry.Games)
|
||||||
{
|
{
|
||||||
var mfst = game.Value.OriginIDs.FirstOrDefault(g => KnownMFSTs.Contains(g.Replace(":", "")));
|
var mfst = game.Value.OriginIDs.FirstOrDefault(g => KnownMFSTs.Contains(g));
|
||||||
if (mfst == null)
|
if (mfst == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@ -91,7 +89,7 @@ namespace Wabbajack.Common.StoreHandlers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed class OriginGame : AStoreGame
|
public sealed class OriginGame : AStoreGame
|
||||||
{
|
{
|
||||||
private string _mfst;
|
private string _mfst;
|
||||||
@ -123,12 +121,12 @@ namespace Wabbajack.Common.StoreHandlers
|
|||||||
{
|
{
|
||||||
var manifestData = GetAndCacheManifestResponse(this._mfst).FromJsonString<GameLocalDataResponse>();
|
var manifestData = GetAndCacheManifestResponse(this._mfst).FromJsonString<GameLocalDataResponse>();
|
||||||
var platform = manifestData!.publishing!.softwareList!.software!.FirstOrDefault(a => a.softwarePlatform == "PCWIN");
|
var platform = manifestData!.publishing!.softwareList!.software!.FirstOrDefault(a => a.softwarePlatform == "PCWIN");
|
||||||
|
|
||||||
var installPath = GetPathFromPlatformPath(platform!.fulfillmentAttributes!.installCheckOverride!);
|
var installPath = GetPathFromPlatformPath(platform!.fulfillmentAttributes!.installCheckOverride!);
|
||||||
return installPath;
|
return installPath;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal AbsolutePath GetPathFromPlatformPath(string path, RegistryView platformView)
|
internal AbsolutePath GetPathFromPlatformPath(string path, RegistryView platformView)
|
||||||
{
|
{
|
||||||
if (!path.StartsWith("["))
|
if (!path.StartsWith("["))
|
||||||
@ -169,7 +167,7 @@ namespace Wabbajack.Common.StoreHandlers
|
|||||||
|
|
||||||
return (AbsolutePath)keyValue!.ToString()!;
|
return (AbsolutePath)keyValue!.ToString()!;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal AbsolutePath GetPathFromPlatformPath(string path)
|
internal AbsolutePath GetPathFromPlatformPath(string path)
|
||||||
{
|
{
|
||||||
var resultPath = GetPathFromPlatformPath(path, RegistryView.Registry64);
|
var resultPath = GetPathFromPlatformPath(path, RegistryView.Registry64);
|
||||||
|
Loading…
Reference in New Issue
Block a user