mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove context param from saveinfo contructor

Browse source
This commit is contained in:
emmaus 2018-09-08 20:31:17 +00:00
commit f2d0bb505b
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.HLE/FileSystem/SaveHelper.cs
View file

@ -36,8 +36,8 @@ namespace Ryujinx.HLE.FileSystem
} }
string SavePath = Path.Combine(BaseSavePath, string SavePath = Path.Combine(BaseSavePath,
SaveMetaData.SaveID.ToString("x16"), SaveMetaData.SaveId.ToString("x16"),
SaveMetaData.UserID.ToString(), SaveMetaData.UserId.ToString(),
SaveMetaData.SaveDataType == SaveDataType.SaveData ? CurrentTitleId.ToString("x16") : string.Empty); SaveMetaData.SaveDataType == SaveDataType.SaveData ? CurrentTitleId.ToString("x16") : string.Empty);
return SavePath; return SavePath;

23
Ryujinx.HLE/FileSystem/SaveInfo.cs
View file

@ -1,24 +1,27 @@
using Ryujinx.HLE.HOS; using Ryujinx.HLE.HOS.SystemState;
using Ryujinx.HLE.HOS.SystemState;
namespace Ryujinx.HLE.FileSystem namespace Ryujinx.HLE.FileSystem
{ {
struct SaveInfo struct SaveInfo
{ {
public long TitleId { get; private set; } public long TitleId { get; private set; }
public long SaveID { get; private set; } public long SaveId { get; private set; }
public UserId UserID { get; private set; } public UserId UserId { get; private set; }
public SaveDataType SaveDataType { get; private set; } public SaveDataType SaveDataType { get; private set; }
public SaveSpaceId SaveSpaceId { get; private set; } public SaveSpaceId SaveSpaceId { get; private set; }
public SaveInfo(ServiceCtx Context, SaveSpaceId SaveSpaceId) public SaveInfo(long TitleId,
long SaveId,
SaveDataType SaveDataType,
UserId UserId,
SaveSpaceId SaveSpaceId)
{ {
TitleId = Context.RequestData.ReadInt64(); this.TitleId = TitleId;
UserID = new UserId(Context.RequestData.ReadInt64(), Context.RequestData.ReadInt64()); this.UserId = UserId;
SaveID = Context.RequestData.ReadInt64(); this.SaveId = SaveId;
SaveDataType = (SaveDataType)Context.RequestData.ReadByte(); this.SaveDataType = SaveDataType;
this.SaveSpaceId = SaveSpaceId; this.SaveSpaceId = SaveSpaceId;
} }
} }
} }

10
Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
View file

@ -76,7 +76,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ {
SaveSpaceId SaveSpaceId = (SaveSpaceId)Context.RequestData.ReadInt64(); SaveSpaceId SaveSpaceId = (SaveSpaceId)Context.RequestData.ReadInt64();
SaveInfo SaveInfo = new SaveInfo(Context, SaveSpaceId); long TitleId = Context.RequestData.ReadInt64();
UserId UserId = new UserId(Context.RequestData.ReadInt64(), Context.RequestData.ReadInt64());
long SaveId = Context.RequestData.ReadInt64();
SaveDataType SaveDataType = (SaveDataType)Context.RequestData.ReadByte();
SaveInfo SaveInfo = new SaveInfo(TitleId, SaveId, SaveDataType, UserId, SaveSpaceId);
MakeObject(Context, new IFileSystem(Context.Device.FileSystem.GetGameSavePath(SaveInfo, Context))); MakeObject(Context, new IFileSystem(Context.Device.FileSystem.GetGameSavePath(SaveInfo, Context)));
} }