citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #2874 from danzel/spelling-1 

Fix some spelling mistakes
This commit is contained in:
Weiyi Wang 2017-08-11 11:02:14 +03:00 committed by GitHub
parent aaf5161344 8d3f48d0a3
commit 53ef90d1bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/citra/default_ini.h
View File

@ -12,7 +12,7 @@ const char* sdl2_config_file = R"(
# It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..." # 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 # 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: # - "keyboard" (default) for keyboard input. Required parameters:
# - "code": the code of the key to bind # - "code": the code of the key to bind
# - "sdl" for joystick input using SDL. Required parameters: # - "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 # - "hat"(optional): the index of the hat to bind as direction buttons
# - "axis"(optional): the index of the axis to bind # - "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" # - "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 # triggered if the axis value crosses
# - "direction"(only used for axis): "+" means the button is triggered when the axis value # - "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 # is greater than the threshold; "-" means the button is triggered when the axis value
@ -42,7 +42,7 @@ button_zl=
button_zr= button_zr=
button_home= 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: # - "analog_from_button" (default) for emulating analog input from direction buttons. Required parameters:
# - "up", "down", "left", "right": sub-devices for each direction. # - "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" # Should be in the format as a button input devices using escape characters, for example, "engine$0keyboard$1code$00"

2
src/input_common/sdl/sdl.cpp
View File

@ -159,7 +159,7 @@ public:
* - "axis"(optional): the index of the axis to bind * - "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", * - "direction"(only used for hat): the direction name of the hat to bind. Can be "up",
* "down", "left" or "right" * "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 * triggered if the axis value crosses
* - "direction"(only used for axis): "+" means the button is triggered when the axis value * - "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 * is greater than the threshold; "-" means the button is triggered when the axis value