fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XAM] Cleanup user settings header to reduce including issues

Browse Source
This commit is contained in:
Adrian
2026-02-04 23:40:23 +00:00
committed by Radosław Gliński
parent 1a9613705d
commit ef65c6761b
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/xenia/kernel/xam/user_settings.cc
View File

@@ -12,21 +12,11 @@
#include "third_party/fmt/include/fmt/format.h"
#include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xam/xdbf/gpd_info.h"
namespace xe {
namespace kernel {
namespace xam {
const static std::array<UserSetting, 3> default_setting_values = {
UserSetting(UserSettingId::XPROFILE_OPTION_CONTROLLER_VIBRATION, 3),
UserSetting(
UserSettingId::XPROFILE_GAMER_TIER,
X_XAMACCOUNTINFO::AccountSubscriptionTier::kSubscriptionTierGold),
UserSetting(
UserSettingId::XPROFILE_GAMERCARD_PICTURE_KEY,
xe::string_util::read_u16string_and_swap(u"FFFE07D10002000200010002"))};
UserSetting::UserSetting(const UserSetting& setting) : UserData(setting) {
setting_id_ = setting.setting_id_;
setting_source_ = setting.setting_source_;
@@ -52,8 +42,7 @@ UserSetting::UserSetting(const X_XDBF_GPD_SETTING_HEADER* profile_setting,
static_cast<UserSettingId>(profile_setting->setting_id.get())),
setting_source_(X_USER_PROFILE_SETTING_SOURCE::TITLE) {}
std::optional<UserSetting> UserSetting::GetDefaultSetting(
const UserProfile* user, uint32_t setting_id) {
std::optional<UserSetting> UserSetting::GetDefaultSetting(uint32_t setting_id) {
for (const auto& setting : default_setting_values) {
if (setting.get_setting_id() == setting_id) {
return std::make_optional<UserSetting>(setting);