summaryrefslogtreecommitdiff
path: root/main/input_default.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main/input_default.cpp')
-rw-r--r--main/input_default.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index 82dec86067..0561f2bb34 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -381,15 +381,12 @@ void InputDefault::parse_input_event(const InputEvent& p_event) {
if (!p_event.is_echo()) {
for (const Map<StringName,InputMap::Action>::Element *E=InputMap::get_singleton()->get_action_map().front();E;E=E->next()) {
- if (InputMap::get_singleton()->event_is_action(p_event,E->key())) {
-
- if(is_action_pressed(E->key()) != p_event.is_pressed()) {
- Action action;
- action.fixed_frame=Engine::get_singleton()->get_fixed_frames();
- action.idle_frame=Engine::get_singleton()->get_idle_frames();
- action.pressed=p_event.is_pressed();
- action_state[E->key()]=action;
- }
+ if (InputMap::get_singleton()->event_is_action(p_event,E->key()) && is_action_pressed(E->key()) != p_event.is_pressed()) {
+ Action action;
+ action.fixed_frame=Engine::get_singleton()->get_fixed_frames();
+ action.idle_frame=Engine::get_singleton()->get_idle_frames();
+ action.pressed=p_event.is_pressed();
+ action_state[E->key()]=action;
}
}
}