From bf5374adbf6808ce69a72c17235bec5931f628a7 Mon Sep 17 00:00:00 2001
From: GreYFoX <GreYFoXGTi@GMaiL.CoM>
Date: Wed, 31 Aug 2011 02:48:58 +0200
Subject: [PATCH] Reverted a change

---
 src/engine/console.h            |  4 ++--
 src/engine/shared/console.cpp   | 22 +++++++++-------------
 src/engine/shared/console.h     |  4 ++--
 src/game/server/gamecontext.cpp |  7 +------
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/engine/console.h b/src/engine/console.h
index 37a8e79f5..dd49f48e5 100644
--- a/src/engine/console.h
+++ b/src/engine/console.h
@@ -79,8 +79,8 @@ public:
 	virtual void StoreCommands(bool Store) = 0;
 
 	virtual bool LineIsValid(const char *pStr) = 0;
-	virtual bool ExecuteLine(const char *Sptr, int ClientID = -1) = 0;
-	virtual bool ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1) = 0;
+	virtual void ExecuteLine(const char *Sptr, int ClientID = -1) = 0;
+	virtual void ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1) = 0;
 	virtual void ExecuteFile(const char *pFilename, int ClientID = -1) = 0;
 
 	virtual int RegisterPrintCallback(int OutputLevel, FPrintCallback pfnPrintCallback, void *pUserData) = 0;
diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
index 8d55a24bc..bf7ccda1f 100644
--- a/src/engine/shared/console.cpp
+++ b/src/engine/shared/console.cpp
@@ -253,7 +253,7 @@ bool CConsole::LineIsValid(const char *pStr)
 	return true;
 }
 
-bool CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID)
+void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID)
 {
 	while(pStr && *pStr)
 	{
@@ -287,10 +287,10 @@ bool CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID)
 		}
 
 		if(ParseStart(&Result, pStr, (pEnd-pStr) + 1) != 0)
-			return false;
+			return;
 
 		if(!*Result.m_pCommand)
-			return false;
+			return;
 
 		CCommand *pCommand = FindCommand(Result.m_pCommand, m_FlagMask);
 
@@ -324,12 +324,11 @@ bool CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID)
 					else
 					{
 						if(pCommand->m_Flags&CMDFLAG_TEST && !g_Config.m_SvTestingCommands)
-							return false;
+							return;
 						pCommand->m_pfnCallback(&Result, pCommand->m_pUserData);
-						if (pCommand->m_Flags&CMDFLAG_TEST) {
+						if (pCommand->m_Flags&CMDFLAG_TEST)
 							m_Cheated = true;
-						}
-						return true;
+
 					}
 				}
 			}
@@ -349,7 +348,6 @@ bool CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID)
 
 		pStr = pNextPart;
 	}
-	return false;
 }
 
 void CConsole::PossibleCommands(const char *pStr, int FlagMask, bool Temp, FPossibleCallback pfnCallback, void *pUser)
@@ -378,12 +376,10 @@ CConsole::CCommand *CConsole::FindCommand(const char *pName, int FlagMask)
 	return 0x0;
 }
 
-bool CConsole::ExecuteLine(const char *pStr, int ClientID)
+void CConsole::ExecuteLine(const char *pStr, int ClientID)
 {
-	bool Press = false, Release = false;
-	Press = CConsole::ExecuteLineStroked(1, pStr, ClientID); // press it
-	Release = CConsole::ExecuteLineStroked(0, pStr, ClientID); // then release it
-	return Press || Release;
+	CConsole::ExecuteLineStroked(1, pStr); // press it
+	CConsole::ExecuteLineStroked(0, pStr); // then release it
 }
 
 
diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h
index db6b865d5..01753d6ba 100644
--- a/src/engine/shared/console.h
+++ b/src/engine/shared/console.h
@@ -58,7 +58,7 @@ class CConsole : public IConsole
 	static void ConModCommandStatus(IConsole::IResult *pResult, void *pUser);
 
 	void ExecuteFileRecurse(const char *pFilename);
-	bool ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1);
+	void ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1);
 
 	struct
 	{
@@ -169,7 +169,7 @@ public:
 	virtual void StoreCommands(bool Store);
 
 	virtual bool LineIsValid(const char *pStr);
-	virtual bool ExecuteLine(const char *pStr, int ClientID = -1);
+	virtual void ExecuteLine(const char *pStr, int ClientID = -1);
 	virtual void ExecuteFile(const char *pFilename, int ClientID = -1);
 
 	virtual int RegisterPrintCallback(int OutputLevel, FPrintCallback pfnPrintCallback, void *pUserData);
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index a1904a364..1c37ffcaa 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -759,12 +759,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
 			else
 				Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_USER);
 			// Todo(Shereef Marzouk): Follow up on the RCON/Chat redirection
-			if(!m_pChatCommands->ExecuteLine(pMsg->m_pMessage + 1, ClientID))
-			{
-				char aBuf[128];
-				str_format(aBuf, sizeof(aBuf), "The execution of the line '%s' has been denied (maybe the admin didn't allow the command for users).", pMsg->m_pMessage + 1);
-				SendChatTarget(ClientID, aBuf);
-			}
+			m_pChatCommands->ExecuteLine(pMsg->m_pMessage + 1, ClientID);
 			Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
 			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "chat",
 					pMsg->m_pMessage);