Revert "#9178 - Fix bindKey & unbindKey on commands (#201)"

This reverts commit c5c6b3c.

Author: ccw808

Client/core/CKeyBinds.cpp

@@ -770,7 +770,6 @@ bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool
 {
     NullEmptyStrings(szKey, szCommand, szArguments);
 
-    bool bReturn = false;
     list<CKeyBind*>::const_iterator iter = m_pList->begin();
     for (; iter != m_pList->end(); iter++)
     {
@@ -785,25 +784,18 @@ bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool
                     {
                         if (!checkHitState || (pBind->bHitState == bState))
                         {
-                            if ((!szArguments && (!bActive || !pBind->szArguments)) 
-                                || (szArguments && pBind->szArguments && strcmp(pBind->szArguments, szArguments) == 0))
+                            if (!szArguments || (pBind->szArguments && strcmp(pBind->szArguments, szArguments) == 0))
                             {
-                                bool bOldActive = pBind->bActive;
                                 pBind->bActive = bActive;
-                                if (szArguments)
-                                {
-                                    return true;
-                                }
-                                else
-                                    bReturn = (bReturn || bOldActive != bActive);
+                                return true;
                             }
                         }
                     }
                 }
             }
         }
     }
-    return bReturn;
+    return false;
 }
 
 void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand, bool bState, const char* szArguments, bool checkHitState)

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -6420,24 +6420,6 @@ bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitSta
     return bSuccess;
 }
 
-static inline void BindKeyAtHitState(CKeyBindsInterface* pKeyBinds, const char* szKey, const char* szCommandName, const char* szArguments, const char* szResource, const bool bHitState, bool& bSuccess)
-{    
-    // Check if its binded already (dont rebind)
-    if (!pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))
-    {
-        if (pKeyBinds->AddCommand(szKey, szCommandName, szArguments, bHitState, szResource, true))
-        {
-            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, szArguments, szResource, true, true);
-            bSuccess = true;
-        }
-    }
-    else 
-    {
-        pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, szArguments, szResource, true, true);
-        bSuccess = true;
-    }
-}
-
 bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitState, const char* szCommandName, const char* szArguments, const char* szResource)
 {
     assert(szKey);
@@ -6449,13 +6431,30 @@ bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitSta
     bool                bKey = pKeyBinds->IsKey(szKey);
     if (bKey)
     {
-        if (!stricmp(szHitState, "down") || !stricmp(szHitState, "both")) 
+        bool bHitState = true;
+        // Activate all keys for this command
+        pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true);
+        // Check if its binded already (dont rebind)
+        if (pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))
+            return true;
+
+        if ((!stricmp(szHitState, "down") || !stricmp(szHitState, "both")) &&
+            pKeyBinds->AddCommand(szKey, szCommandName, szArguments, bHitState, szResource, true))
         {
-            BindKeyAtHitState(pKeyBinds, szKey, szCommandName, szArguments, szResource, true, bSuccess);
+            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, szArguments, szResource, true, true);
+            bSuccess = true;
         }
-        if (!stricmp(szHitState, "up") || !stricmp(szHitState, "both"))
+
+        bHitState = false;
+        pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true);
+        if (pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))
+            return true;
+
+        if ((!stricmp(szHitState, "up") || !stricmp(szHitState, "both")) &&
+            pKeyBinds->AddCommand(szKey, szCommandName, szArguments, bHitState, szResource, true))
         {
-            BindKeyAtHitState(pKeyBinds, szKey, szCommandName, szArguments, szResource, false, bSuccess);
+            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, szArguments, szResource, true, true);
+            bSuccess = true;
         }
     }
     return bSuccess;
@@ -6511,14 +6510,29 @@ bool CStaticFunctionDefinitions::UnbindKey(const char* szKey, const char* szHitS
     bool                bKey = pKeyBinds->IsKey(szKey);
     if (bKey)
     {
+        bool bCheckHitState = false, bHitState = true;
+        if (szHitState)
+        {
+            if (stricmp(szHitState, "down") == 0)
+            {
+                bCheckHitState = true, bHitState = true;
+            }
+            else if (stricmp(szHitState, "up") == 0)
+            {
+                bCheckHitState = true, bHitState = false;
+            }
+        }
         if ((!stricmp(szHitState, "down") || !stricmp(szHitState, "both")) &&
-            pKeyBinds->SetCommandActive(szKey, szCommandName, true, NULL, szResource, false, true))
+            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true))
         {
+            pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true);
             bSuccess = true;
         }
+        bHitState = false;
         if ((!stricmp(szHitState, "up") || !stricmp(szHitState, "both")) &&
-            pKeyBinds->SetCommandActive(szKey, szCommandName, false, NULL, szResource, false, true))
+            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true))
         {
+            pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true);
             bSuccess = true;
         }
     }