summaryrefslogtreecommitdiffstats
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-02-22 00:50:16 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-02-22 21:09:08 +0100
commitaa64f69af019d6a30e812593eaa70ba9c90dd865 (patch)
treef6de223fb79ddf3563d4c7f5a5e126f59f61835c /src/citra/config.cpp
parentMerge pull request #590 from linkmauve/rename-dolphin (diff)
downloadyuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.gz
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.bz2
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.lz
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.xz
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.zst
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.zip
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r--src/citra/config.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index f5b4069c7..e9f3dfd5b 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -44,6 +44,8 @@ void Config::ReadValues() {
Settings::values.pad_y_key = glfw_config->GetInteger("Controls", "pad_y", GLFW_KEY_X);
Settings::values.pad_l_key = glfw_config->GetInteger("Controls", "pad_l", GLFW_KEY_Q);
Settings::values.pad_r_key = glfw_config->GetInteger("Controls", "pad_r", GLFW_KEY_W);
+ Settings::values.pad_zl_key = glfw_config->GetInteger("Controls", "pad_zl", GLFW_KEY_1);
+ Settings::values.pad_zr_key = glfw_config->GetInteger("Controls", "pad_zr", GLFW_KEY_2);
Settings::values.pad_start_key = glfw_config->GetInteger("Controls", "pad_start", GLFW_KEY_M);
Settings::values.pad_select_key = glfw_config->GetInteger("Controls", "pad_select", GLFW_KEY_N);
Settings::values.pad_home_key = glfw_config->GetInteger("Controls", "pad_home", GLFW_KEY_B);
@@ -55,6 +57,10 @@ void Config::ReadValues() {
Settings::values.pad_sdown_key = glfw_config->GetInteger("Controls", "pad_sdown", GLFW_KEY_DOWN);
Settings::values.pad_sleft_key = glfw_config->GetInteger("Controls", "pad_sleft", GLFW_KEY_LEFT);
Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT);
+ Settings::values.pad_cup_key = glfw_config->GetInteger("Controls", "pad_cup", GLFW_KEY_I);
+ Settings::values.pad_cdown_key = glfw_config->GetInteger("Controls", "pad_cdown", GLFW_KEY_K);
+ Settings::values.pad_cleft_key = glfw_config->GetInteger("Controls", "pad_cleft", GLFW_KEY_J);
+ Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L);
// Core
Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 30);