godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3658 from Hinsbart/doc_joyevent 

doc: use correct identifiers for InputEventJoystick{Motion, Button}
This commit is contained in:
Rémi Verschelde 2016-02-11 07:17:43 +01:00
parent db43e94175 6de2b9d864
commit 285c400288
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/os/input_event.cpp
View File

@ -107,13 +107,13 @@ InputEvent::operator String() const {
} break;
case JOYSTICK_MOTION: {
str+= "Event: JoyMotion ";
str+= "Event: JoystickMotion ";
str=str+"Axis: "+itos(joy_motion.axis)+" Value: " +rtos(joy_motion.axis_value);
return str;
} break;
case JOYSTICK_BUTTON: {
str+= "Event: JoyButton ";
str+= "Event: JoystickButton ";
str=str+"Pressed: "+itos(joy_button.pressed)+" Index: " +itos(joy_button.button_index)+" pressure "+rtos(joy_button.pressure);
return str;

4
modules/gdscript/gd_editor.cpp
View File

@ -2324,8 +2324,8 @@ Error GDScriptLanguage::complete_code(const String& p_code, const String& p_base
"# Key",
"# MouseMotion",
"# MouseButton",
"# JoyMotion",
"# JoyButton",
"# JoystickMotion",
"# JoystickButton",
"# ScreenTouch",
"# ScreenDrag",
"# Action"

2
tools/doc/doc_data.cpp
View File

@ -433,7 +433,7 @@ void DocData::generate(bool p_basic_types) {
if (i==Variant::INPUT_EVENT) {
static const char* ie_type[InputEvent::TYPE_MAX]={
"","Key","MouseMotion","MouseButton","JoyMotion","JoyButton","ScreenTouch","ScreenDrag","Action"
"","Key","MouseMotion","MouseButton","JoystickMotion","JoystickButton","ScreenTouch","ScreenDrag","Action"
};
cname+=ie_type[j];
}