midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New3DS: Minor style cleanup to #1520.

Browse Source
This commit is contained in:
bunnei 2016-05-24 17:22:44 -04:00
parent 2e5e7d9be0
commit c106f71beb
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra/config.cpp
View File

@ -78,7 +78,7 @@ void Config::ReadValues() {
Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
// System // System
Settings::values.is_new3ds = sdl2_config->GetBoolean("System", "is_new3ds", false); Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false);
Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1); Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1);
// Miscellaneous // Miscellaneous

4
src/citra_qt/config.cpp
View File

@ -61,7 +61,7 @@ void Config::ReadValues() {
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("System"); qt_config->beginGroup("System");
Settings::values.is_new3ds = qt_config->value("is_new3ds", false).toBool(); Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool();
Settings::values.region_value = qt_config->value("region_value", 1).toInt(); Settings::values.region_value = qt_config->value("region_value", 1).toInt();
qt_config->endGroup(); qt_config->endGroup();
@ -152,7 +152,7 @@ void Config::SaveValues() {
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("System"); qt_config->beginGroup("System");
qt_config->setValue("is_new3ds", Settings::values.is_new3ds); qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds);
qt_config->setValue("region_value", Settings::values.region_value); qt_config->setValue("region_value", Settings::values.region_value);
qt_config->endGroup(); qt_config->endGroup();

4
src/core/hle/service/ptm/ptm.cpp
View File

@ -91,10 +91,10 @@ void IsLegacyPowerOff(Service::Interface* self) {
void CheckNew3DS(Service::Interface* self) { void CheckNew3DS(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer(); u32* cmd_buff = Kernel::GetCommandBuffer();
const bool is_new_3ds = Settings::values.is_new3ds; const bool is_new_3ds = Settings::values.is_new_3ds;
if (is_new_3ds) { if (is_new_3ds) {
LOG_CRITICAL(Service_PTM, "The option 'is_new3ds' is enabled as part of the 'System' settings. Citra does not fully support New3DS emulation yet!"); LOG_CRITICAL(Service_PTM, "The option 'is_new_3ds' is enabled as part of the 'System' settings. Citra does not fully support New 3DS emulation yet!");
} }
cmd_buff[1] = RESULT_SUCCESS.raw; cmd_buff[1] = RESULT_SUCCESS.raw;

2
src/core/settings.h
View File

@ -42,7 +42,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
struct Values { struct Values {
// CheckNew3DS // CheckNew3DS
bool is_new3ds; bool is_new_3ds;
// Controls // Controls
std::array<int, NativeInput::NUM_INPUTS> input_mappings; std::array<int, NativeInput::NUM_INPUTS> input_mappings;