aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-10-06 13:02:23 -0400
committerLioncash <mathew1800@gmail.com>2019-10-06 13:42:23 -0400
commit69f16ba50e3c52a17405670b976ac4ba63f58021 (patch)
treee64b63528a155da323ea02039ede638fb6994ecd /src/core/core.h
parentdeecd7f074a0547b8fc08a33fdc547eb63859e3e (diff)
hle/service: Replace global system instance calls with instance-based ones
Migrates the HLE service code off the use of directly accessing the global system instance where trivially able to do so. This removes all usages of Core::CurrentProcess from the service code, only 8 occurrences of this function exist elsewhere. There's still quite a bit of "System::GetInstance()" being used, however this was able to replace a few instances.
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/core.h b/src/core/core.h
index f49b7fbf9f..fecfdb9594 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -98,6 +98,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
class System {
public:
+ using CurrentBuildProcessID = std::array<u8, 0x20>;
+
System(const System&) = delete;
System& operator=(const System&) = delete;
@@ -330,9 +332,9 @@ public:
bool GetExitLock() const;
- void SetCurrentProcessBuildID(std::array<u8, 0x20> id);
+ void SetCurrentProcessBuildID(const CurrentBuildProcessID& id);
- const std::array<u8, 0x20>& GetCurrentProcessBuildID() const;
+ const CurrentBuildProcessID& GetCurrentProcessBuildID() const;
private:
System();