diff options
| author | emmauss <emmausssss@gmail.com> | 2018-10-07 16:13:46 +0300 |
|---|---|---|
| committer | Thomas Guillemard <thog@protonmail.com> | 2018-10-07 15:13:46 +0200 |
| commit | caa181edf2c956a1433d3c2f8678231af52f9dad (patch) | |
| tree | 4d7297bb09e90541368132a92b5235eee4315832 /Ryujinx.HLE/FileSystem | |
| parent | 5b8ccb717f225234ae97a2ef1673ca42833bd836 (diff) | |
Save Common implementation (#434)
* save common implementation
* remove zero userid check
* Renamed UserId to UInt128
* fix index in hex conversion
Diffstat (limited to 'Ryujinx.HLE/FileSystem')
| -rw-r--r-- | Ryujinx.HLE/FileSystem/SaveHelper.cs | 5 | ||||
| -rw-r--r-- | Ryujinx.HLE/FileSystem/SaveInfo.cs | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Ryujinx.HLE/FileSystem/SaveHelper.cs b/Ryujinx.HLE/FileSystem/SaveHelper.cs index 67f01016..087156d2 100644 --- a/Ryujinx.HLE/FileSystem/SaveHelper.cs +++ b/Ryujinx.HLE/FileSystem/SaveHelper.cs @@ -1,5 +1,6 @@ using Ryujinx.HLE.HOS; using System.IO; +using System.Linq; using static Ryujinx.HLE.FileSystem.VirtualFileSystem; @@ -35,9 +36,11 @@ namespace Ryujinx.HLE.FileSystem } } + string SaveAccount = SaveMetaData.UserId.IsZero() ? "savecommon" : SaveMetaData.UserId.ToString(); + string SavePath = Path.Combine(BaseSavePath, SaveMetaData.SaveId.ToString("x16"), - SaveMetaData.UserId.ToString(), + SaveAccount, SaveMetaData.SaveDataType == SaveDataType.SaveData ? CurrentTitleId.ToString("x16") : string.Empty); return SavePath; diff --git a/Ryujinx.HLE/FileSystem/SaveInfo.cs b/Ryujinx.HLE/FileSystem/SaveInfo.cs index f3790ec7..3acd33fd 100644 --- a/Ryujinx.HLE/FileSystem/SaveInfo.cs +++ b/Ryujinx.HLE/FileSystem/SaveInfo.cs @@ -1,4 +1,4 @@ -using Ryujinx.HLE.HOS.SystemState; +using Ryujinx.HLE.Utilities; namespace Ryujinx.HLE.FileSystem { @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.FileSystem { public long TitleId { get; private set; } public long SaveId { get; private set; } - public UserId UserId { get; private set; } + public UInt128 UserId { get; private set; } public SaveDataType SaveDataType { get; private set; } public SaveSpaceId SaveSpaceId { get; private set; } @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.FileSystem long TitleId, long SaveId, SaveDataType SaveDataType, - UserId UserId, + UInt128 UserId, SaveSpaceId SaveSpaceId) { this.TitleId = TitleId; |