Add new onClientCoreCommand event (#2554)

* Add onClientCoreCommand event
* Remove debug assert in CFileLoaderSA that causes crashes without valid reason

Author: Pieter-Dewachter

Client/core/CCommands.cpp

@@ -133,7 +133,6 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
             // Execute it
             if (!bIsScriptedBind || pEntry->bAllowScriptedBind)
                 ExecuteHandler(pEntry->pfnCmdFunc, szParameters);
-            return true;
         }
     }
 
@@ -208,7 +207,8 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     // Try to execute the handler
     if (m_pfnExecuteHandler)
     {
-        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, (pEntry != NULL), bIsScriptedBind))
+        bool bAllowScriptedBind = (!pEntry || pEntry->bAllowScriptedBind);
+        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, (pEntry != NULL), bIsScriptedBind, bAllowScriptedBind))
             return true;
     }
 

Client/mods/deathmatch/ClientCommands.cpp

@@ -29,7 +29,7 @@ using std::vector;
 
 extern CClientGame* g_pClientGame;
 
-bool COMMAND_Executed(const char* szCommand, const char* szArguments, bool bHandleRemotely, bool bHandled, bool bIsScriptedBind)
+bool COMMAND_Executed(const char* szCommand, const char* szArguments, bool bHandleRemotely, bool bHandled, bool bIsScriptedBind, bool bAllowScriptedBind)
 {
     // Has the core already handled this command?
     if (!bHandled)
@@ -95,8 +95,16 @@ bool COMMAND_Executed(const char* szCommand, const char* szArguments, bool bHand
     }
     else
     {
-        // Call our comand-handlers for core-executed commands too
-        g_pClientGame->GetRegisteredCommands()->ProcessCommand(szCommand, szArguments);
+        // Call the onClientCoreCommand event
+        CLuaArguments Arguments;
+        Arguments.PushString(szCommand);
+
+        auto pLocalPlayer = g_pClientGame->GetLocalPlayer();
+        pLocalPlayer->CallEvent("onClientCoreCommand", Arguments, true);
+
+        // Call our comand-handlers for core-executed commands too, if allowed
+        if (bAllowScriptedBind)
+            g_pClientGame->GetRegisteredCommands()->ProcessCommand(szCommand, szArguments);
     }
     return false;
 }

Client/mods/deathmatch/ClientCommands.h

@@ -11,7 +11,7 @@
 
 #pragma once
 
-bool COMMAND_Executed(const char* szCommand, const char* szArguments, bool bHandleRemotely, bool bHandled, bool bIsScriptedBind);
+bool COMMAND_Executed(const char* szCommand, const char* szArguments, bool bHandleRemotely, bool bHandled, bool bIsScriptedBind, bool bAllowScriptedBind);
 
 void COMMAND_Help(const char* szCmdLine);
 void COMMAND_Disconnect(const char* szCmdLine);

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -2705,6 +2705,7 @@ void CClientGame::AddBuiltInEvents()
 
     // Console events
     m_Events.AddEvent("onClientConsole", "text", NULL, false);
+    m_Events.AddEvent("onClientCoreCommand", "command", NULL, false);
 
     // Chat events
     m_Events.AddEvent("onClientChatMessage", "text, r, g, b, messageType", NULL, false);

Client/sdk/core/CCommandsInterface.h

@@ -14,7 +14,7 @@
 #include <list>
 
 typedef void (*PFNCOMMANDHANDLER)(const char*);
-typedef bool (*pfnExecuteCommandHandler)(const char*, const char*, bool, bool, bool);
+typedef bool (*pfnExecuteCommandHandler)(const char*, const char*, bool, bool, bool, bool);
 
 typedef void (*PFNCOMMAND)(const char*);