summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/acc/profile_manager.h
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-08-11 10:26:13 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2018-08-11 10:26:13 +0200
commitdfea525cbe3a337d3a1fa30136029599ae47ee71 (patch)
treeced572df6134a023b31716dae274dd3d042c06fb /src/core/hle/service/acc/profile_manager.h
parentFirst round of account changes (diff)
downloadyuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.tar
yuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.tar.gz
yuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.tar.bz2
yuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.tar.lz
yuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.tar.xz
yuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.tar.zst
yuzu-dfea525cbe3a337d3a1fa30136029599ae47ee71.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/acc/profile_manager.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index ad4c20db0..121206954 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -12,10 +12,11 @@
namespace Service::Account {
constexpr size_t MAX_USERS = 8;
constexpr size_t MAX_DATA = 128;
+static const u128 INVALID_UUID = {0, 0};
struct UUID {
// UUIDs which are 0 are considered invalid!
- u128 uuid{0, 0};
+ u128 uuid = INVALID_UUID;
UUID() = default;
explicit UUID(const u128& id) : uuid{id} {}
explicit UUID(const u64 lo, const u64 hi) {
@@ -23,7 +24,7 @@ struct UUID {
uuid[1] = hi;
};
explicit operator bool() const {
- return uuid[0] != 0x0 || uuid[1] != 0x0;
+ return uuid[0] != INVALID_UUID[0] && uuid[1] != INVALID_UUID[1];
}
bool operator==(const UUID& rhs) const {
@@ -41,8 +42,7 @@ struct UUID {
return *this;
}
void Invalidate() {
- uuid[0] = 0;
- uuid[1] = 0;
+ uuid = INVALID_UUID;
}
std::string Format() const {
return fmt::format("0x{:016X}{:016X}", uuid[1], uuid[0]);
@@ -81,7 +81,7 @@ public:
ProfileManager(); // TODO(ogniK): Load from system save
ResultCode AddUser(ProfileInfo user);
ResultCode CreateNewUser(UUID uuid, std::array<u8, 0x20>& username);
- ResultCode CreateNewUser(UUID uuid, std::string username);
+ ResultCode CreateNewUser(UUID uuid, const std::string& username);
size_t GetUserIndex(const UUID& uuid) const;
size_t GetUserIndex(ProfileInfo user) const;
bool GetProfileBase(size_t index, ProfileBase& profile) const;