diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-02-11 07:17:43 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-02-11 07:17:43 +0100 |
| commit | 285c400288e3a7ccb41d14b1751c88b09c1df294 (patch) | |
| tree | eb5885c93146b4488aa9c0c80ec7bac12e9fa950 | |
| parent | db43e941752590f32e949638e35f5891bc8979c3 (diff) | |
| parent | 6de2b9d8649d81180d7da733237370afd08657fa (diff) | |
Merge pull request #3658 from Hinsbart/doc_joyevent
doc: use correct identifiers for InputEventJoystick{Motion, Button}
| -rw-r--r-- | core/os/input_event.cpp | 4 | ||||
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 4 | ||||
| -rw-r--r-- | tools/doc/doc_data.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 2f39567a7e..3022a56e2a 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -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; diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index 8dfb55a6b6..b4e5c04c95 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -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" diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 11e4797747..3836fa710b 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -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]; } |