preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-07 05:03:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hrydgard:master' into feature_openxr_stereo

Browse Source
This commit is contained in:
Luboš Vonásek
2022-08-27 12:23:38 +02:00
committed by GitHub
parent 723d641771 9f4a849453
commit 5e434bccdb
18 changed files with 1673 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Config.cpp
+11 -9
View File
@@ -331,7 +331,7 @@ struct ConfigSetting {
section->Get(ini5_, &ptr_.customButton->repeat, default_.customButton.repeat);
return true;
default:
_dbg_assert_msg_(false, "Unexpected ini setting type");
_dbg_assert_msg_(false, "Get(%s): Unexpected ini setting type: %d", iniKey_, (int)type_);
return false;
}
}
@@ -375,7 +375,7 @@ struct ConfigSetting {
section->Set(ini5_, ptr_.customButton->repeat);
return;
default:
_dbg_assert_msg_(false, "Unexpected ini setting type");
_dbg_assert_msg_(false, "Set(%s): Unexpected ini setting type: %d", iniKey_, (int)type_);
return;
}
}
@@ -406,22 +406,22 @@ struct ConfigSetting {
// Doesn't report.
return;
default:
_dbg_assert_msg_(false, "Unexpected ini setting type");
_dbg_assert_msg_(false, "Report(%s): Unexpected ini setting type: %d", iniKey_, (int)type_);
return;
}
}
const char *iniKey_;
const char *ini2_;
const char *ini3_;
const char *ini4_;
const char *ini5_;
const char *iniKey_ = nullptr;
const char *ini2_ = nullptr;
const char *ini3_ = nullptr;
const char *ini4_ = nullptr;
const char *ini5_ = nullptr;
Type type_;
bool report_;
bool save_;
bool perGame_;
SettingPtr ptr_;
DefaultValue default_;
DefaultValue default_{};
Callback cb_;
// We only support transform for ints.
@@ -1208,6 +1208,8 @@ static ConfigSetting vrSettings[] = {
ConfigSetting("VREnableStereo", &g_Config.bEnableStereo, true),
ConfigSetting("VRCanvasDistance", &g_Config.iCanvasDistance, 6),
ConfigSetting("VRFieldOfView", &g_Config.iFieldOfViewPercentage, 100),
ConfigSetting(false),
};
static ConfigSectionSettings sections[] = {