#9178 - Fix bindKey & unbindKey on commands (2) (#214)

emre1702 · ccw808 · commit bbd05a541dbc · 2018-07-05T15:59:09.000+01:00
diff --git a/Client/core/CKeyBinds.cpp b/Client/core/CKeyBinds.cpp
@@ -766,7 +766,7 @@ bool CKeyBinds::CommandExists(const char* szKey, const char* szCommand, bool bCh
 }
 
 bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool bState, const char* szArguments, const char* szResource, bool bActive,
-                                 bool checkHitState)
+                                 bool checkHitState, bool bConsiderDefaultKey)
 {
     NullEmptyStrings(szKey, szCommand, szArguments);
 
@@ -775,9 +775,11 @@ bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool
     {
         if ((*iter)->GetType() == KEY_BIND_COMMAND)
         {
-            if (!szKey || (stricmp((*iter)->boundKey->szKey, szKey) == 0))
+            CCommandBind* pBind = static_cast<CCommandBind*>(*iter);
+            if (!szKey 
+                || (stricmp(pBind->boundKey->szKey, szKey) == 0)
+                || (bConsiderDefaultKey && pBind->bIsReplacingScriptKey && stricmp(pBind->strOriginalScriptKey, szKey) == 0))
             {
-                CCommandBind* pBind = static_cast<CCommandBind*>(*iter);
                 if (pBind->szResource && (strcmp(pBind->szResource, szResource) == 0))
                 {
                     if (!szCommand || (strcmp(pBind->szCommand, szCommand) == 0))
@@ -798,7 +800,7 @@ bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool
     return false;
 }
 
-void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand, bool bState, const char* szArguments, bool checkHitState)
+void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand, bool bState, const char* szArguments, bool checkHitState, const char* szOnlyWithDefaultKey)
 {
     NullEmptyStrings(szCommand, szArguments);
 
@@ -816,7 +818,12 @@ void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const
                     {
                         if (!szArguments || (pBind->szArguments && strcmp(pBind->szArguments, szArguments) == 0))
                         {
-                            pBind->bActive = bActive;
+                            if (!szOnlyWithDefaultKey 
+                                || (pBind->bIsReplacingScriptKey && stricmp(pBind->strOriginalScriptKey, szOnlyWithDefaultKey) == 0)
+                                || stricmp(pBind->boundKey->szKey, szOnlyWithDefaultKey) == 0)
+                            {
+                                pBind->bActive = bActive;
+                            }
                         }
                     }
                 }
diff --git a/Client/core/CKeyBinds.h b/Client/core/CKeyBinds.h
@@ -63,9 +63,9 @@ class CKeyBinds : public CKeyBindsInterface
     bool CommandExists(const char* szKey, const char* szCommand, bool bCheckState = false, bool bState = true, const char* szArguments = NULL,
                        const char* szResource = NULL, bool bCheckScriptCreated = false, bool bScriptCreated = false);
     bool SetCommandActive(const char* szKey, const char* szCommand, bool bState, const char* szArguments, const char* szResource, bool bActive,
-                          bool checkHitState);
+                          bool checkHitState, bool bConsiderDefaultKey = false);
     void SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand = NULL, bool bState = true, const char* szArguments = NULL,
-                              bool checkHitState = false);
+                              bool checkHitState = false, const char* szOnlyWithDefaultKey = nullptr);
     CCommandBind* GetBindFromCommand(const char* szCommand, const char* szArguments = NULL, bool bMatchCase = true, const char* szKey = NULL,
                                      bool bCheckHitState = false, bool bState = NULL);
     bool          GetBoundCommands(const char* szCommand, std::list<CCommandBind*>& commandsList);
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -6433,7 +6433,7 @@ bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitSta
     {
         bool bHitState = true;
         // Activate all keys for this command
-        pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true);
+        pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true, szKey);
         // Check if its binded already (dont rebind)
         if (pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))
             return true;
@@ -6446,7 +6446,7 @@ bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitSta
         }
 
         bHitState = false;
-        pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true);
+        pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true, szKey);
         if (pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))
             return true;
 
@@ -6523,16 +6523,16 @@ bool CStaticFunctionDefinitions::UnbindKey(const char* szKey, const char* szHitS
             }
         }
         if ((!stricmp(szHitState, "down") || !stricmp(szHitState, "both")) &&
-            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true))
+            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true, true))
         {
-            pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true);
+            pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true, szKey);
             bSuccess = true;
         }
         bHitState = false;
         if ((!stricmp(szHitState, "up") || !stricmp(szHitState, "both")) &&
-            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true))
+            pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true, true))
         {
-            pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true);
+            pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true, szKey);
             bSuccess = true;
         }
     }
diff --git a/Client/sdk/core/CKeyBindsInterface.h b/Client/sdk/core/CKeyBindsInterface.h
@@ -164,9 +164,9 @@ class CKeyBindsInterface
     virtual bool CommandExists(const char* szKey, const char* szCommand, bool bCheckState = false, bool bState = true, const char* szArguments = NULL,
                                const char* szResource = NULL, bool bCheckScriptCreated = false, bool bScriptCreated = false) = 0;
     virtual bool SetCommandActive(const char* szKey, const char* szCommand, bool bState, const char* szArguments, const char* szResource, bool bActive,
-                                  bool checkHitState) = 0;
+                                  bool checkHitState, bool bConsiderDefaultKey = false) = 0;
     virtual void SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand = NULL, bool bState = true, const char* szArguments = NULL,
-                                      bool checkHitState = false) = 0;
+                                      bool checkHitState = false, const char* szOnlyWithDefaultKey = NULL) = 0;
     virtual CCommandBind* GetBindFromCommand(const char* szCommand, const char* szArguments = NULL, bool bMatchCase = true, const char* szKey = NULL,
                                              bool bCheckHitState = false, bool bState = NULL) = 0;
     virtual bool          GetBoundCommands(const char* szCommand, std::list<CCommandBind*>& commandsList) = 0;

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ bool CKeyBinds::CommandExists(const char* szKey, const char* szCommand, bool bCh`
`766`	`766`	`}`
`767`	`767`
`768`	`768`	`bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool bState, const char* szArguments, const char* szResource, bool bActive,`
`769`		`- bool checkHitState)`
	`769`	`+ bool checkHitState, bool bConsiderDefaultKey)`
`770`	`770`	`{`
`771`	`771`	`NullEmptyStrings(szKey, szCommand, szArguments);`
`772`	`772`
`@@ -775,9 +775,11 @@ bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool`
`775`	`775`	`{`
`776`	`776`	`if ((*iter)->GetType() == KEY_BIND_COMMAND)`
`777`	`777`	`{`
`778`		`- if (!szKey \|\| (stricmp((*iter)->boundKey->szKey, szKey) == 0))`
	`778`	`+ CCommandBind* pBind = static_cast<CCommandBind>(iter);`
	`779`	`+ if (!szKey`
	`780`	`+ \|\| (stricmp(pBind->boundKey->szKey, szKey) == 0)`
	`781`	`+ \|\| (bConsiderDefaultKey && pBind->bIsReplacingScriptKey && stricmp(pBind->strOriginalScriptKey, szKey) == 0))`
`779`	`782`	`{`
`780`		`- CCommandBind* pBind = static_cast<CCommandBind>(iter);`
`781`	`783`	`if (pBind->szResource && (strcmp(pBind->szResource, szResource) == 0))`
`782`	`784`	`{`
`783`	`785`	`if (!szCommand \|\| (strcmp(pBind->szCommand, szCommand) == 0))`
`@@ -798,7 +800,7 @@ bool CKeyBinds::SetCommandActive(const char* szKey, const char* szCommand, bool`
`798`	`800`	`return false;`
`799`	`801`	`}`
`800`	`802`
`801`		`-void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand, bool bState, const char* szArguments, bool checkHitState)`
	`803`	`+void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const char* szCommand, bool bState, const char* szArguments, bool checkHitState, const char* szOnlyWithDefaultKey)`
`802`	`804`	`{`
`803`	`805`	`NullEmptyStrings(szCommand, szArguments);`
`804`	`806`
`@@ -816,7 +818,12 @@ void CKeyBinds::SetAllCommandsActive(const char* szResource, bool bActive, const`
`816`	`818`	`{`
`817`	`819`	`if (!szArguments \|\| (pBind->szArguments && strcmp(pBind->szArguments, szArguments) == 0))`
`818`	`820`	`{`
`819`		`- pBind->bActive = bActive;`
	`821`	`+ if (!szOnlyWithDefaultKey`
	`822`	`+ \|\| (pBind->bIsReplacingScriptKey && stricmp(pBind->strOriginalScriptKey, szOnlyWithDefaultKey) == 0)`
	`823`	`+ \|\| stricmp(pBind->boundKey->szKey, szOnlyWithDefaultKey) == 0)`
	`824`	`+ {`
	`825`	`+ pBind->bActive = bActive;`
	`826`	`+ }`
`820`	`827`	`}`
`821`	`828`	`}`
`822`	`829`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6433,7 +6433,7 @@ bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitSta`
`6433`	`6433`	`{`
`6434`	`6434`	`bool bHitState = true;`
`6435`	`6435`	`// Activate all keys for this command`
`6436`		`- pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true);`
	`6436`	`+ pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true, szKey);`
`6437`	`6437`	`// Check if its binded already (dont rebind)`
`6438`	`6438`	`if (pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))`
`6439`	`6439`	`return true;`
`@@ -6446,7 +6446,7 @@ bool CStaticFunctionDefinitions::BindKey(const char* szKey, const char* szHitSta`
`6446`	`6446`	`}`
`6447`	`6447`
`6448`	`6448`	`bHitState = false;`
`6449`		`- pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true);`
	`6449`	`+ pKeyBinds->SetAllCommandsActive(szResource, true, szCommandName, bHitState, szArguments, true, szKey);`
`6450`	`6450`	`if (pKeyBinds->CommandExists(szKey, szCommandName, true, bHitState, szArguments, szResource, true, true))`
`6451`	`6451`	`return true;`
`6452`	`6452`
`@@ -6523,16 +6523,16 @@ bool CStaticFunctionDefinitions::UnbindKey(const char* szKey, const char* szHitS`
`6523`	`6523`	`}`
`6524`	`6524`	`}`
`6525`	`6525`	`if ((!stricmp(szHitState, "down") \|\| !stricmp(szHitState, "both")) &&`
`6526`		`- pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true))`
	`6526`	`+ pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true, true))`
`6527`	`6527`	`{`
`6528`		`- pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true);`
	`6528`	`+ pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true, szKey);`
`6529`	`6529`	`bSuccess = true;`
`6530`	`6530`	`}`
`6531`	`6531`	`bHitState = false;`
`6532`	`6532`	`if ((!stricmp(szHitState, "up") \|\| !stricmp(szHitState, "both")) &&`
`6533`		`- pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true))`
	`6533`	`+ pKeyBinds->SetCommandActive(szKey, szCommandName, bHitState, NULL, szResource, false, true, true))`
`6534`	`6534`	`{`
`6535`		`- pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true);`
	`6535`	`+ pKeyBinds->SetAllCommandsActive(szResource, false, szCommandName, bHitState, NULL, true, szKey);`
`6536`	`6536`	`bSuccess = true;`
`6537`	`6537`	`}`
`6538`	`6538`	`}`