From a6d3c8816e38c4f29030eee260a72ae60471696e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 1 Apr 2016 08:39:06 +0200 Subject: [PATCH] Fix last two bindings in input_mapping demo Also connect the signal from script, as it makes it easier to understand than by having to check the connected signals via the GUI. --- gui/input_mapping/controls.gd | 4 +++- gui/input_mapping/controls.scn | Bin 2698 -> 2026 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/input_mapping/controls.gd b/gui/input_mapping/controls.gd index 3cee6e68..f3373537 100644 --- a/gui/input_mapping/controls.gd +++ b/gui/input_mapping/controls.gd @@ -51,4 +51,6 @@ func _ready(): # We assume that the key binding that we want is the first one (0), if there are several input_event = InputMap.get_action_list(action)[0] # See note at the beginning of the script - get_node("bindings").get_node(action).get_node("Button").set_text(OS.get_scancode_string(input_event.scancode)) + var button = get_node("bindings").get_node(action).get_node("Button") + button.set_text(OS.get_scancode_string(input_event.scancode)) + button.connect("pressed", self, "wait_for_input", [action]) diff --git a/gui/input_mapping/controls.scn b/gui/input_mapping/controls.scn index 98cbbca4645aa0eb8bba7c0368b8f6c0b2dcf55e..7894212fb7f385907ffcb5c2e1fd53509b584455 100644 GIT binary patch literal 2026 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