diff options
| author | Juan Linietsky | 2017-01-08 17:05:51 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-08 17:06:33 -0300 |
| commit | 547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch) | |
| tree | 9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /core/globals.cpp | |
| parent | 6323779596dea0db7f58afef7d3d3d5588ef20cb (diff) | |
| download | godot-547a57777b199f451305a6d4b6ad63fb0b2bd3ed.tar.gz godot-547a57777b199f451305a6d4b6ad63fb0b2bd3ed.tar.zst godot-547a57777b199f451305a6d4b6ad63fb0b2bd3ed.zip | |
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index b6498c62e..0b5fe4a82 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -616,7 +616,7 @@ static Variant _decode_variant(const String& p_string) { ERR_FAIL_COND_V(params.size()!=2,Variant()); InputEvent ie; - ie.type=InputEvent::JOYSTICK_BUTTON; + ie.type=InputEvent::JOYPAD_BUTTON; ie.device=params[0].to_int(); ie.joy_button.button_index=params[1].to_int(); @@ -628,7 +628,7 @@ static Variant _decode_variant(const String& p_string) { ERR_FAIL_COND_V(params.size()!=2,Variant()); InputEvent ie; - ie.type=InputEvent::JOYSTICK_MOTION; + ie.type=InputEvent::JOYPAD_MOTION; ie.device=params[0].to_int(); int axis = params[1].to_int();; ie.joy_motion.axis=axis>>1; @@ -1031,11 +1031,11 @@ static String _encode_variant(const Variant& p_variant) { return "mbutton("+itos(ev.device)+", "+itos(ev.mouse_button.button_index)+")"; } break; - case InputEvent::JOYSTICK_BUTTON: { + case InputEvent::JOYPAD_BUTTON: { return "jbutton("+itos(ev.device)+", "+itos(ev.joy_button.button_index)+")"; } break; - case InputEvent::JOYSTICK_MOTION: { + case InputEvent::JOYPAD_MOTION: { return "jaxis("+itos(ev.device)+", "+itos(ev.joy_motion.axis * 2 + (ev.joy_motion.axis_value<0?0:1))+")"; } break; @@ -1463,7 +1463,7 @@ GlobalConfig::GlobalConfig() { InputEvent key; key.type=InputEvent::KEY; InputEvent joyb; - joyb.type=InputEvent::JOYSTICK_BUTTON; + joyb.type=InputEvent::JOYPAD_BUTTON; GLOBAL_DEF("application/name","" ); |