diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/SCsub | 2 | ||||
| -rw-r--r-- | core/input/input.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/SCsub b/core/SCsub index 52f3506416..1bd4eae16c 100644 --- a/core/SCsub +++ b/core/SCsub @@ -194,7 +194,7 @@ def version_info_builder(target, source, env): ) -env.CommandNoCache("version_generated.gen.h", "#version.py", env.Run(version_info_builder)) +env.CommandNoCache("version_generated.gen.h", env.Value(env.version_info), env.Run(version_info_builder)) # Generate version hash diff --git a/core/input/input.cpp b/core/input/input.cpp index aa4b47934e..56f616fac4 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -1504,6 +1504,7 @@ void Input::parse_mapping(const String &p_mapping) { JoyAxis output_axis = _get_output_axis(output); if (output_button == JoyButton::INVALID && output_axis == JoyAxis::INVALID) { print_verbose(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping)); + continue; } ERR_CONTINUE_MSG(output_button != JoyButton::INVALID && output_axis != JoyAxis::INVALID, vformat("Output string \"%s\" matched both button and axis in mapping:\n%s", output, p_mapping)); |