diff options
| author | emmaus <emmausssss@gmail.com> | 2018-08-02 20:14:49 +0000 |
|---|---|---|
| committer | emmauss <emmausssss@gmail.com> | 2018-08-02 23:33:28 +0300 |
| commit | a9a2c0c2f59e1354ca27bdf66d23fcc13e6025d6 (patch) | |
| tree | 3b3340e8b72498ba4cb7c8f206c37d15cf99b00b | |
| parent | d137405e941c18ba0db0c3e06a2306ede9af8779 (diff) | |
moved metadata to process
| -rw-r--r-- | Ryujinx.HLE/OsHle/Horizon.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.HLE/OsHle/Process.cs | 3 | ||||
| -rw-r--r-- | Ryujinx.HLE/OsHle/SystemStateMgr.cs | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Ryujinx.HLE/OsHle/Horizon.cs b/Ryujinx.HLE/OsHle/Horizon.cs index 4c117fa4..0318fba5 100644 --- a/Ryujinx.HLE/OsHle/Horizon.cs +++ b/Ryujinx.HLE/OsHle/Horizon.cs @@ -85,13 +85,13 @@ namespace Ryujinx.HLE.OsHle using (FileStream Input = new FileStream(File, FileMode.Open)) { - SystemStateMgr.TitleMetadata = new Npdm(Input); + MainProcess.Metadata = new Npdm(Input); } } LoadNpdm("*.npdm"); - if (!SystemStateMgr.TitleMetadata.Is64Bits) + if (!MainProcess.Metadata.Is64Bits) { throw new Exception("32-bit titles are unsupported!"); } diff --git a/Ryujinx.HLE/OsHle/Process.cs b/Ryujinx.HLE/OsHle/Process.cs index c7606dc9..ac5ed456 100644 --- a/Ryujinx.HLE/OsHle/Process.cs +++ b/Ryujinx.HLE/OsHle/Process.cs @@ -4,6 +4,7 @@ using ChocolArm64.Memory; using ChocolArm64.State; using Ryujinx.HLE.Loaders; using Ryujinx.HLE.Loaders.Executables; +using Ryujinx.HLE.Loaders.Npdm; using Ryujinx.HLE.Logging; using Ryujinx.HLE.OsHle.Diagnostics; using Ryujinx.HLE.OsHle.Exceptions; @@ -48,6 +49,8 @@ namespace Ryujinx.HLE.OsHle public AppletStateMgr AppletState { get; private set; } + public Npdm Metadata { get; set; } + private SvcHandler SvcHandler; private ConcurrentDictionary<int, AThread> TlsSlots; diff --git a/Ryujinx.HLE/OsHle/SystemStateMgr.cs b/Ryujinx.HLE/OsHle/SystemStateMgr.cs index 32c88994..7b6ef7f3 100644 --- a/Ryujinx.HLE/OsHle/SystemStateMgr.cs +++ b/Ryujinx.HLE/OsHle/SystemStateMgr.cs @@ -5,8 +5,6 @@ namespace Ryujinx.HLE.OsHle { public class SystemStateMgr { - internal static Npdm TitleMetadata { get; set; } - internal static string[] LanguageCodes = new string[] { "ja", |