xrEngine/xr_level_controller.h: IsBinded now also supports contextual search

07fbd105 · xottab-duty · 0335f95e · 07fbd105 · 07fbd105
--- a/src/xrEngine/xr_level_controller.cpp
+++ b/src/xrEngine/xr_level_controller.cpp
@@ -602,13 +602,15 @@ game_action* ActionNameToPtr(pcstr name)
    return nullptr;
 }

-bool IsBinded(EGameActions action_id, int dik)
+bool IsBinded(EGameActions action_id, int dik, EKeyContext context /*= EKeyContext::Undefined*/)
 {
    key_binding* binding = &g_key_bindings[action_id];
    for (u8 i = 0; i < bindtypes_count; ++i)
+    {
        if (binding->m_keyboard[i] && binding->m_keyboard[i]->dik == dik)
-            return true;
-
+            if (binding->m_action->key_context == context)
+                return true;
+    }
    return false;
 }


--- a/src/xrEngine/xr_level_controller.h
+++ b/src/xrEngine/xr_level_controller.h
@@ -194,7 +194,7 @@ ENGINE_API int KeynameToDik(pcstr name);
 ENGINE_API keyboard_key* KeynameToPtr(pcstr name);
 ENGINE_API keyboard_key* DikToPtr(int dik, bool safe);

-ENGINE_API bool IsBinded(EGameActions action_id, int dik);
+ENGINE_API bool IsBinded(EGameActions action_id, int dik, EKeyContext context = EKeyContext::Undefined);
 ENGINE_API int GetActionDik(EGameActions action_id, int idx = -1);
 ENGINE_API EGameActions GetBindedAction(int dik, EKeyContext context = EKeyContext::Undefined);