aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.HLE')
-rw-r--r--Ryujinx.HLE/HOS/Horizon.cs22
-rw-r--r--Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Npdm/ACI0.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Npdm/ACID.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Npdm/Npdm.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs2
8 files changed, 17 insertions, 19 deletions
diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs
index 1e218c87..aa01bfc9 100644
--- a/Ryujinx.HLE/HOS/Horizon.cs
+++ b/Ryujinx.HLE/HOS/Horizon.cs
@@ -105,11 +105,9 @@ namespace Ryujinx.HLE.HOS
public Nacp ControlData { get; set; }
- public string CurrentTitle { get; private set; }
-
public string TitleName { get; private set; }
- public string TitleID { get; private set; }
+ public string TitleId { get; private set; }
public IntegrityCheckLevel FsIntegrityCheckLevel { get; set; }
@@ -366,7 +364,7 @@ namespace Ryujinx.HLE.HOS
{
ControlData = new Nacp(controlFile.AsStream());
- TitleName = CurrentTitle = ControlData.Descriptions[(int) State.DesiredTitleLanguage].Title;
+ TitleName = ControlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
}
}
@@ -500,12 +498,12 @@ namespace Ryujinx.HLE.HOS
Nacp controlData = new Nacp(controlFile.AsStream());
- TitleName = CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
- TitleID = metaData.Aci0.TitleId.ToString("x16");
+ TitleName = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
+ TitleId = metaData.Aci0.TitleId.ToString("x16");
- if (string.IsNullOrWhiteSpace(CurrentTitle))
+ if (string.IsNullOrWhiteSpace(TitleName))
{
- TitleName = CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title;
+ TitleName = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title;
}
return controlData;
@@ -517,7 +515,7 @@ namespace Ryujinx.HLE.HOS
}
else
{
- TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
+ TitleId = metaData.Aci0.TitleId.ToString("x16");
}
}
@@ -557,7 +555,7 @@ namespace Ryujinx.HLE.HOS
}
}
- TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
+ TitleId = metaData.Aci0.TitleId.ToString("x16");
LoadNso("rtld");
LoadNso("main");
@@ -659,8 +657,8 @@ namespace Ryujinx.HLE.HOS
ContentManager.LoadEntries();
- TitleName = CurrentTitle = metaData.TitleName;
- TitleID = metaData.Aci0.TitleId.ToString("x16");
+ TitleName = metaData.TitleName;
+ TitleId = metaData.Aci0.TitleId.ToString("x16");
ProgramLoader.LoadStaticObjects(this, metaData, new IExecutable[] { staticObject });
}
diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
index c1c6d26d..4962e3ff 100644
--- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
+++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
@@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS.Services.Arp
return new ApplicationLaunchProperty
{
- TitleId = BitConverter.ToInt64(StringUtils.HexToBytes(context.Device.System.TitleID), 0),
+ TitleId = BitConverter.ToInt64(StringUtils.HexToBytes(context.Device.System.TitleId), 0),
Version = 0x00,
BaseGameStorageId = (byte)StorageId.NandSystem,
UpdateGameStorageId = (byte)StorageId.None
diff --git a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
index 8350acf7..209e79d1 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
@@ -3,7 +3,7 @@ using System.IO;
namespace Ryujinx.HLE.Loaders.Npdm
{
- class Aci0
+ public class Aci0
{
private const int Aci0Magic = 'A' << 0 | 'C' << 8 | 'I' << 16 | '0' << 24;
diff --git a/Ryujinx.HLE/Loaders/Npdm/ACID.cs b/Ryujinx.HLE/Loaders/Npdm/ACID.cs
index 4a181b29..365495c6 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ACID.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ACID.cs
@@ -3,7 +3,7 @@ using System.IO;
namespace Ryujinx.HLE.Loaders.Npdm
{
- class Acid
+ public class Acid
{
private const int AcidMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
diff --git a/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
index 3359435d..d0f349ea 100644
--- a/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
@@ -2,7 +2,7 @@
namespace Ryujinx.HLE.Loaders.Npdm
{
- class FsAccessControl
+ public class FsAccessControl
{
public int Version { get; private set; }
public ulong PermissionsBitmask { get; private set; }
diff --git a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
index d8e40d0b..39803642 100644
--- a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
@@ -2,7 +2,7 @@
namespace Ryujinx.HLE.Loaders.Npdm
{
- class KernelAccessControl
+ public class KernelAccessControl
{
public int[] Capabilities { get; private set; }
diff --git a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
index 169e68da..4400793f 100644
--- a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
// https://github.com/SciresM/hactool/blob/master/npdm.c
// https://github.com/SciresM/hactool/blob/master/npdm.h
// http://switchbrew.org/index.php?title=NPDM
- class Npdm
+ public class Npdm
{
private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24;
diff --git a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
index 03f62ff7..54012b8a 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
@@ -5,7 +5,7 @@ using System.Text;
namespace Ryujinx.HLE.Loaders.Npdm
{
- class ServiceAccessControl
+ public class ServiceAccessControl
{
public IReadOnlyDictionary<string, bool> Services { get; private set; }