diff options
Diffstat (limited to 'main/input_default.cpp')
| -rw-r--r-- | main/input_default.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index b1084900d6..18b4649f4d 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -280,7 +280,7 @@ void InputDefault::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool Ref<InputEventMouseButton> mb = p_event; - if (mb.is_valid() && !mb->is_doubleclick()) { + if (mb.is_valid()) { if (mb->is_pressed()) { mouse_button_mask |= (1 << (mb->get_button_index() - 1)); @@ -1084,7 +1084,7 @@ Array InputDefault::get_connected_joypads() { return ret; } -static const char *_buttons[] = { +static const char *_buttons[JOY_BUTTON_MAX] = { "Face Button Bottom", "Face Button Right", "Face Button Left", @@ -1103,7 +1103,7 @@ static const char *_buttons[] = { "DPAD Right" }; -static const char *_axes[] = { +static const char *_axes[JOY_AXIS_MAX] = { "Left Stick X", "Left Stick Y", "Right Stick X", @@ -1111,7 +1111,9 @@ static const char *_axes[] = { "", "", "L2", - "R2" + "R2", + "", + "" }; String InputDefault::get_joy_button_string(int p_button) { |