summaryrefslogtreecommitdiffstats
path: root/core/input/input_map.cpp
diff options
context:
space:
mode:
authorGeorge L. Albany <Megacake1234@gmail.com>2024-11-03 05:10:14 +0000
committerGitHub <noreply@github.com>2024-11-03 05:10:14 +0000
commit70f9c12cfbcea6dff89b2a6f4868a9e6fe3866f8 (patch)
treef202e4a27092f0fdd9d579eb46e6828ecb4673e1 /core/input/input_map.cpp
parent9043ceac65972c4195dd71f15a8a1cc7aa72985f (diff)
parenta684ee1dec108bb1a050f07ec3dd73fd5ef02dbc (diff)
downloadredot-engine-70f9c12cfbcea6dff89b2a6f4868a9e6fe3866f8.tar.gz
Merge pull request #834 from Spartan322/merge/c6c464c
Merge commit godotengine/godot@c6c464c
Diffstat (limited to 'core/input/input_map.cpp')
-rw-r--r--core/input/input_map.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index 9c10b143dd..553de4af9c 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -116,7 +116,7 @@ void InputMap::get_argument_options(const StringName &p_function, int p_idx, Lis
#endif
void InputMap::add_action(const StringName &p_action, float p_deadzone) {
- ERR_FAIL_COND_MSG(input_map.has(p_action), "InputMap already has action \"" + String(p_action) + "\".");
+ ERR_FAIL_COND_MSG(input_map.has(p_action), vformat("InputMap already has action \"%s\".", String(p_action)));
input_map[p_action] = Action();
static int last_id = 1;
input_map[p_action].id = last_id;