diff options
author | Weiyi Wang <wwylele@gmail.com> | 2017-08-11 10:02:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-11 10:02:14 +0200 |
commit | 53ef90d1bde275367d71cb7d4658a7e7399da7e8 (patch) | |
tree | 32c3e6453de7981511c163be00472f8b0c1dfcd4 | |
parent | Merge pull request #2863 from wwylele/pad-state-zero (diff) | |
parent | Fix some spelling mistakes (diff) | |
download | yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.tar yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.tar.gz yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.tar.bz2 yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.tar.lz yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.tar.xz yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.tar.zst yuzu-53ef90d1bde275367d71cb7d4658a7e7399da7e8.zip |
-rw-r--r-- | src/citra/default_ini.h | 6 | ||||
-rw-r--r-- | src/input_common/sdl/sdl.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index a12498e0f..b0a0ebd3b 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -12,7 +12,7 @@ const char* sdl2_config_file = R"( # It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..." # Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values -# for button input, the following devices are avaible: +# for button input, the following devices are available: # - "keyboard" (default) for keyboard input. Required parameters: # - "code": the code of the key to bind # - "sdl" for joystick input using SDL. Required parameters: @@ -21,7 +21,7 @@ const char* sdl2_config_file = R"( # - "hat"(optional): the index of the hat to bind as direction buttons # - "axis"(optional): the index of the axis to bind # - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", "down", "left" or "right" -# - "threshould"(only used for axis): a float value in (-1.0, 1.0) which the button is +# - "threshold"(only used for axis): a float value in (-1.0, 1.0) which the button is # triggered if the axis value crosses # - "direction"(only used for axis): "+" means the button is triggered when the axis value # is greater than the threshold; "-" means the button is triggered when the axis value @@ -42,7 +42,7 @@ button_zl= button_zr= button_home= -# for analog input, the following devices are avaible: +# for analog input, the following devices are available: # - "analog_from_button" (default) for emulating analog input from direction buttons. Required parameters: # - "up", "down", "left", "right": sub-devices for each direction. # Should be in the format as a button input devices using escape characters, for example, "engine$0keyboard$1code$00" diff --git a/src/input_common/sdl/sdl.cpp b/src/input_common/sdl/sdl.cpp index 756ee58b7..d404afa89 100644 --- a/src/input_common/sdl/sdl.cpp +++ b/src/input_common/sdl/sdl.cpp @@ -159,7 +159,7 @@ public: * - "axis"(optional): the index of the axis to bind * - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", * "down", "left" or "right" - * - "threshould"(only used for axis): a float value in (-1.0, 1.0) which the button is + * - "threshold"(only used for axis): a float value in (-1.0, 1.0) which the button is * triggered if the axis value crosses * - "direction"(only used for axis): "+" means the button is triggered when the axis value * is greater than the threshold; "-" means the button is triggered when the axis value |