OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-26 02:20:06 +00:00
Code Issues Projects Releases Wiki Activity

Make consistent settings values between qt and sdl

Browse Source
This commit is contained in:
Anon 2016-12-17 10:29:31 -06:00
parent 81be512755
commit d8f6dfc70d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra/config.cpp
View File

@ -59,7 +59,7 @@ void Config::ReadValues() {
Settings::values.pad_circle_modifier_scale = Settings::values.pad_circle_modifier_scale =
(float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5); (float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5);
Settings::values.pad_circle_deadzone = Settings::values.pad_circle_deadzone =
(float)sdl2_config->GetReal("Controls", "pad_circle_deadzone", 0.4); (float)sdl2_config->GetReal("Controls", "pad_circle_deadzone", 0.3);
// Core // Core
Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);

2
src/citra/default_ini.h
View File

@ -38,7 +38,7 @@ pad_circle_modifier =
pad_circle_modifier_scale = pad_circle_modifier_scale =
# Deadzone applied to the circle pad. # Deadzone applied to the circle pad.
# Must be in range of 0.0 - 1.0. Defaults to 0.4 # Must be in range of 0.0 - 1.0. Defaults to 0.3
pad_circle_deadzone = pad_circle_deadzone =
[Core] [Core]

2
src/citra_qt/config.cpp
View File

@ -37,7 +37,7 @@ void Config::ReadValues() {
Settings::values.pad_circle_modifier = Settings::InputDeviceMapping( Settings::values.pad_circle_modifier = Settings::InputDeviceMapping(
qt_config->value("pad_circle_modifier", 0).toString().toStdString()); qt_config->value("pad_circle_modifier", 0).toString().toStdString());
Settings::values.pad_circle_modifier_scale = Settings::values.pad_circle_modifier_scale =
qt_config->value("pad_circle_modifier_scale", 0.4).toFloat(); qt_config->value("pad_circle_modifier_scale", 0.5).toFloat();
Settings::values.pad_circle_deadzone = qt_config->value("pad_circle_deadzone", 0.3f).toFloat(); Settings::values.pad_circle_deadzone = qt_config->value("pad_circle_deadzone", 0.3f).toFloat();
qt_config->endGroup(); qt_config->endGroup();