Merge pull request #271 from Zegeri/keys

More user-friendly report of missing keys
OpenXRay · Nov 9, 2018 · 9396cc2 · 9396cc2
2 parents b4f778f + 154c836
commit 9396cc2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -37,21 +37,22 @@ 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 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;
     }
 }