From 17a4e4b28f85b6eb0add40b06d73f357a63c71d1 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 12 Mar 2023 19:09:39 +0100 Subject: [PATCH] Ported: Change message of unknown joypad property from error to warning. - rsubtil and akien-mga https://github.com/godotengine/godot/commit/e814861950c56fdcfbd706508c85d7d2adef9662 --- main/input_default.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main/input_default.cpp b/main/input_default.cpp index 6359b3b5e..6232b5151 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1192,8 +1192,11 @@ void InputDefault::parse_mapping(String p_mapping) { JoystickList output_button = _get_output_button(output); JoystickList output_axis = _get_output_axis(output); - ERR_CONTINUE_MSG(output_button == JOY_INVALID_OPTION && output_axis == JOY_INVALID_OPTION, - vformat("Unrecognised output string \"%s\" in mapping:\n%s", output, p_mapping)); + + if (output_button == JOY_INVALID_OPTION && output_axis == JOY_INVALID_OPTION) { + print_verbose(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping)); + } + ERR_CONTINUE_MSG(output_button != JOY_INVALID_OPTION && output_axis != JOY_INVALID_OPTION, vformat("Output string \"%s\" matched both button and axis in mapping:\n%s", output, p_mapping));