diff options
| author | Alex Barney <thealexbarney@gmail.com> | 2022-02-26 16:52:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 00:52:25 +0100 |
| commit | 3705c206688c69d3348f5cec84dc480d8d7c578e (patch) | |
| tree | 6e0efab92727d3712ee27c83be3bdd6df7a97de3 /Ryujinx.HLE/HOS/ApplicationLoader.cs | |
| parent | 7b35ebc64a411e95e197bb36ad4b55c522c3703d (diff) | |
Update LibHac to v0.16.0 (#3159)1.1.54
Diffstat (limited to 'Ryujinx.HLE/HOS/ApplicationLoader.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/ApplicationLoader.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Ryujinx.HLE/HOS/ApplicationLoader.cs b/Ryujinx.HLE/HOS/ApplicationLoader.cs index 65448d5d..cf92abda 100644 --- a/Ryujinx.HLE/HOS/ApplicationLoader.cs +++ b/Ryujinx.HLE/HOS/ApplicationLoader.cs @@ -481,14 +481,14 @@ namespace Ryujinx.HLE.HOS if (result.IsSuccess() && bytesRead == controlData.ByteSpan.Length) { - titleName = controlData.Value.Titles[(int)device.System.State.DesiredTitleLanguage].Name.ToString(); + titleName = controlData.Value.Title[(int)device.System.State.DesiredTitleLanguage].NameString.ToString(); if (string.IsNullOrWhiteSpace(titleName)) { - titleName = controlData.Value.Titles.ToArray().FirstOrDefault(x => x.Name[0] != 0).Name.ToString(); + titleName = controlData.Value.Title.ItemsRo.ToArray().FirstOrDefault(x => x.Name[0] != 0).NameString.ToString(); } - displayVersion = controlData.Value.DisplayVersion.ToString(); + displayVersion = controlData.Value.DisplayVersionString.ToString(); } } else @@ -615,20 +615,20 @@ namespace Ryujinx.HLE.HOS ref ApplicationControlProperty nacp = ref ControlData.Value; - programInfo.Name = nacp.Titles[(int)_device.System.State.DesiredTitleLanguage].Name.ToString(); + programInfo.Name = nacp.Title[(int)_device.System.State.DesiredTitleLanguage].NameString.ToString(); if (string.IsNullOrWhiteSpace(programInfo.Name)) { - programInfo.Name = nacp.Titles.ToArray().FirstOrDefault(x => x.Name[0] != 0).Name.ToString(); + programInfo.Name = nacp.Title.ItemsRo.ToArray().FirstOrDefault(x => x.Name[0] != 0).NameString.ToString(); } if (nacp.PresenceGroupId != 0) { programInfo.ProgramId = nacp.PresenceGroupId; } - else if (nacp.SaveDataOwnerId.Value != 0) + else if (nacp.SaveDataOwnerId != 0) { - programInfo.ProgramId = nacp.SaveDataOwnerId.Value; + programInfo.ProgramId = nacp.SaveDataOwnerId; } else if (nacp.AddOnContentBaseId != 0) { @@ -776,14 +776,14 @@ namespace Ryujinx.HLE.HOS // The set sizes don't actually matter as long as they're non-zero because we use directory savedata. control.UserAccountSaveDataSize = 0x4000; control.UserAccountSaveDataJournalSize = 0x4000; - control.SaveDataOwnerId = applicationId; + control.SaveDataOwnerId = applicationId.Value; Logger.Warning?.Print(LogClass.Application, "No control file was found for this game. Using a dummy one instead. This may cause inaccuracies in some games."); } HorizonClient hos = _device.System.LibHacHorizonManager.RyujinxClient; - Result resultCode = hos.Fs.EnsureApplicationCacheStorage(out _, out _, applicationId, ref control); + Result resultCode = hos.Fs.EnsureApplicationCacheStorage(out _, out _, applicationId, in control); if (resultCode.IsFailure()) { @@ -792,7 +792,7 @@ namespace Ryujinx.HLE.HOS return resultCode; } - resultCode = EnsureApplicationSaveData(hos.Fs, out _, applicationId, ref control, ref user); + resultCode = hos.Fs.EnsureApplicationSaveData(out _, applicationId, in control, in user); if (resultCode.IsFailure()) { |