Support script debugging and prevent duplicate command registration

Author: MohabCodeX

Client/mods/deathmatch/logic/CRegisteredCommands.cpp

@@ -9,6 +9,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include "luadefs/CLuaDefs.h"
 
 using std::list;
 
@@ -27,6 +28,12 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
     assert(pLuaMain);
     assert(szKey);
 
+    if (CommandExists(szKey, NULL))
+    {
+        CLuaDefs::m_pScriptDebugging->LogWarning(pLuaMain->GetVM(), "addCommandHandler: Attempt to register duplicate command '%s'", szKey);
+        return false;
+    }
+
     // Check if we already have this key and handler
     SCommand* pCommand = GetCommand(szKey, pLuaMain);
     if (pCommand)

Server/mods/deathmatch/logic/CGame.cpp

@@ -617,7 +617,7 @@ bool CGame::Start(int iArgumentCount, char* szArguments[])
         m_pACLManager = new CAccessControlListManager;
         m_pHqComms = new CHqComms;
 
-        m_pRegisteredCommands = new CRegisteredCommands(m_pACLManager);
+        m_pRegisteredCommands = new CRegisteredCommands(m_pACLManager, m_pScriptDebugging);
         m_pLuaManager = new CLuaManager(m_pObjectManager, m_pPlayerManager, m_pVehicleManager, m_pBlipManager, m_pRadarAreaManager, m_pRegisteredCommands,
                                         m_pMapManager, &m_Events);
         m_pConsole = new CConsole(m_pBlipManager, m_pMapManager, m_pPlayerManager, m_pRegisteredCommands, m_pVehicleManager, m_pBanManager, m_pACLManager);

Server/mods/deathmatch/logic/CRegisteredCommands.cpp

@@ -18,10 +18,12 @@
 #include "CClient.h"
 #include "CConsoleClient.h"
 #include "CPlayer.h"
+#include "CScriptDebugging.h"
 
-CRegisteredCommands::CRegisteredCommands(CAccessControlListManager* pACLManager)
+CRegisteredCommands::CRegisteredCommands(CAccessControlListManager* pACLManager, CScriptDebugging* pScriptDebugging)
 {
     m_pACLManager = pACLManager;
+    m_pScriptDebugging = pScriptDebugging;
     m_bIteratingList = false;
 }
 
@@ -35,9 +37,15 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
     assert(pLuaMain);
     assert(szKey);
 
+    if (CommandExists(szKey, NULL))
+    {
+        m_pScriptDebugging->LogWarning(pLuaMain->GetVM(), "addCommandHandler: Attempt to register duplicate command '%s'", szKey);
+        return false;
+    }
+
     // Check if we already have this key and handler
     SCommand* pCommand = GetCommand(szKey, pLuaMain);
-
+    
     if (pCommand && iLuaFunction == pCommand->iLuaFunction)
         return false;
 

Server/mods/deathmatch/logic/CRegisteredCommands.h

@@ -30,7 +30,7 @@ class CRegisteredCommands
     };
 
 public:
-    CRegisteredCommands(class CAccessControlListManager* pACLManager);
+    CRegisteredCommands(class CAccessControlListManager* pACLManager, class CScriptDebugging* pScriptDebugging);
     ~CRegisteredCommands();
 
     bool AddCommand(class CLuaMain* pLuaMain, const char* szKey, const CLuaFunctionRef& iLuaFunction, bool bRestricted, bool bCaseSensitive);
@@ -56,4 +56,5 @@ class CRegisteredCommands
     bool                          m_bIteratingList;
 
     class CAccessControlListManager* m_pACLManager;
+    class CScriptDebugging*           m_pScriptDebugging;
 };