diff options
| -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"( | |||
| 12 | # It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..." | 12 | # It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..." |
| 13 | # Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values | 13 | # Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values |
| 14 | 14 | ||
| 15 | # for button input, the following devices are avaible: | 15 | # for button input, the following devices are available: |
| 16 | # - "keyboard" (default) for keyboard input. Required parameters: | 16 | # - "keyboard" (default) for keyboard input. Required parameters: |
| 17 | # - "code": the code of the key to bind | 17 | # - "code": the code of the key to bind |
| 18 | # - "sdl" for joystick input using SDL. Required parameters: | 18 | # - "sdl" for joystick input using SDL. Required parameters: |
| @@ -21,7 +21,7 @@ const char* sdl2_config_file = R"( | |||
| 21 | # - "hat"(optional): the index of the hat to bind as direction buttons | 21 | # - "hat"(optional): the index of the hat to bind as direction buttons |
| 22 | # - "axis"(optional): the index of the axis to bind | 22 | # - "axis"(optional): the index of the axis to bind |
| 23 | # - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", "down", "left" or "right" | 23 | # - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", "down", "left" or "right" |
| 24 | # - "threshould"(only used for axis): a float value in (-1.0, 1.0) which the button is | 24 | # - "threshold"(only used for axis): a float value in (-1.0, 1.0) which the button is |
| 25 | # triggered if the axis value crosses | 25 | # triggered if the axis value crosses |
| 26 | # - "direction"(only used for axis): "+" means the button is triggered when the axis value | 26 | # - "direction"(only used for axis): "+" means the button is triggered when the axis value |
| 27 | # is greater than the threshold; "-" means the button is triggered when the axis value | 27 | # is greater than the threshold; "-" means the button is triggered when the axis value |
| @@ -42,7 +42,7 @@ button_zl= | |||
| 42 | button_zr= | 42 | button_zr= |
| 43 | button_home= | 43 | button_home= |
| 44 | 44 | ||
| 45 | # for analog input, the following devices are avaible: | 45 | # for analog input, the following devices are available: |
| 46 | # - "analog_from_button" (default) for emulating analog input from direction buttons. Required parameters: | 46 | # - "analog_from_button" (default) for emulating analog input from direction buttons. Required parameters: |
| 47 | # - "up", "down", "left", "right": sub-devices for each direction. | 47 | # - "up", "down", "left", "right": sub-devices for each direction. |
| 48 | # Should be in the format as a button input devices using escape characters, for example, "engine$0keyboard$1code$00" | 48 | # 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: | |||
| 159 | * - "axis"(optional): the index of the axis to bind | 159 | * - "axis"(optional): the index of the axis to bind |
| 160 | * - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", | 160 | * - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", |
| 161 | * "down", "left" or "right" | 161 | * "down", "left" or "right" |
| 162 | * - "threshould"(only used for axis): a float value in (-1.0, 1.0) which the button is | 162 | * - "threshold"(only used for axis): a float value in (-1.0, 1.0) which the button is |
| 163 | * triggered if the axis value crosses | 163 | * triggered if the axis value crosses |
| 164 | * - "direction"(only used for axis): "+" means the button is triggered when the axis value | 164 | * - "direction"(only used for axis): "+" means the button is triggered when the axis value |
| 165 | * is greater than the threshold; "-" means the button is triggered when the axis value | 165 | * is greater than the threshold; "-" means the button is triggered when the axis value |