From adc9937f9c0709107aec87be30df47225d012c9f Mon Sep 17 00:00:00 2001 From: Zegeri Date: Wed, 7 Nov 2018 18:33:52 +0100 Subject: [PATCH 1/2] More user-friendly report of missing keys Shows the scancode name instead of the scancode value. --- src/xrEngine/xr_input.cpp | 3 --- src/xrGame/xr_level_controller.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/xrEngine/xr_input.cpp b/src/xrEngine/xr_input.cpp index 2d3ce567109..621d3a06c0f 100644 --- a/src/xrEngine/xr_input.cpp +++ b/src/xrEngine/xr_input.cpp @@ -207,10 +207,7 @@ bool CInput::get_dik_name(int dik, LPSTR dest_str, int dest_sz) if (dik == SDL_SCANCODE_UNKNOWN) keyname = "Unknown"; else - { - Msg("! Can't convert dik_name for dik[%d]", dik); return false; - } } xr_strcpy(dest_str, dest_sz, keyname.c_str()); diff --git a/src/xrGame/xr_level_controller.cpp b/src/xrGame/xr_level_controller.cpp index 1eb51ffa049..56afad7ce99 100644 --- a/src/xrGame/xr_level_controller.cpp +++ b/src/xrGame/xr_level_controller.cpp @@ -47,8 +47,12 @@ void remap_keys() const bool res = pInput->get_dik_name(kb.dik, buff, sizeof(buff)); if (res) kb.key_local_name = buff; - else if (kb.key_local_name.empty()) - kb.key_local_name = kb.key_name; + else + { + Msg("! Can't find a key name for %s", kb.key_name); + if (kb.key_local_name.empty()) + kb.key_local_name = kb.key_name; + } // Msg("[%s]-[%s]", kb.key_name, kb.key_local_name.c_str()); ++idx; From 154c836201835ef2162f8d9dfb9a7ee542adb533 Mon Sep 17 00:00:00 2001 From: Zegeri Date: Thu, 8 Nov 2018 17:10:37 +0100 Subject: [PATCH 2/2] Apply refactoring suggested by @FreeZoneMods --- src/xrGame/xr_level_controller.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/xrGame/xr_level_controller.cpp b/src/xrGame/xr_level_controller.cpp index 56afad7ce99..e961b590ebb 100644 --- a/src/xrGame/xr_level_controller.cpp +++ b/src/xrGame/xr_level_controller.cpp @@ -37,15 +37,13 @@ void initialize_bindings() void remap_keys() { - int idx = 0; string128 buff; // Log("Keys remap:"); - while (keyboards[idx].key_name) + for (int idx = 0; keyboards[idx].key_name; ++idx) { buff[0] = 0; _keyboard& kb = keyboards[idx]; - const bool res = pInput->get_dik_name(kb.dik, buff, sizeof(buff)); - if (res) + if (pInput->get_dik_name(kb.dik, buff, sizeof(buff))) kb.key_local_name = buff; else { @@ -55,7 +53,6 @@ void remap_keys() } // Msg("[%s]-[%s]", kb.key_name, kb.key_local_name.c_str()); - ++idx; } }