Applying FileEx's reviews

Author: MohabCodeX

Client/mods/deathmatch/logic/CRegisteredCommands.cpp

@@ -9,6 +9,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include "CClientGame.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))
+    {
+        g_pClientGame->GetScriptDebugging()->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/CRegisteredCommands.cpp

@@ -18,6 +18,8 @@
 #include "CClient.h"
 #include "CConsoleClient.h"
 #include "CPlayer.h"
+#include "CGame.h"
+#include "CScriptDebugging.h"
 
 CRegisteredCommands::CRegisteredCommands(CAccessControlListManager* pACLManager)
 {
@@ -35,11 +37,17 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
     assert(pLuaMain);
     assert(szKey);
 
+    if (CommandExists(szKey, NULL))
+    {
+        g_pGame->GetScriptDebugging()->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;
+        return false;   
 
     // Create the entry
     pCommand = new SCommand;