From f9e4547b315c8f63467a33c6cab3fc82db4c50a3 Mon Sep 17 00:00:00 2001 From: XXLTomate Date: Sat, 28 Jan 2012 11:14:31 +0100 Subject: [PATCH] fixing the console (2) --- src/engine/console.h | 2 +- src/engine/server/server.cpp | 2 +- src/engine/shared/console.cpp | 4 ++-- src/engine/shared/console.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/console.h b/src/engine/console.h index 6eaca703d..66bdaaa08 100644 --- a/src/engine/console.h +++ b/src/engine/console.h @@ -84,7 +84,7 @@ public: virtual bool LineIsValid(const char *pStr) = 0; virtual void ExecuteLine(const char *Sptr, int ClientID = -1) = 0; - virtual void ExecuteLineFlag(const char *Sptr, int FlasgMask) = 0; + virtual void ExecuteLineFlag(const char *Sptr, int FlasgMask, 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; diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index b6337f521..ced3c1975 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1001,7 +1001,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket) m_RconClientID = ClientID; m_RconAuthLevel = m_aClients[ClientID].m_Authed; Console()->SetAccessLevel(m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_USER); - Console()->ExecuteLineFlag(pCmd, CFGFLAG_SERVER); + Console()->ExecuteLineFlag(pCmd, CFGFLAG_SERVER, ClientID); Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN); m_RconClientID = IServer::RCON_CID_SERV; m_RconAuthLevel = AUTHED_ADMIN; diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index a60b6b823..1ae02c5cf 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -427,11 +427,11 @@ void CConsole::ExecuteLine(const char *pStr, int ClientID) CConsole::ExecuteLineStroked(0, pStr, ClientID); // then release it } -void CConsole::ExecuteLineFlag(const char *pStr, int FlagMask) +void CConsole::ExecuteLineFlag(const char *pStr, int FlagMask, int ClientID) { int Temp = m_FlagMask; m_FlagMask = FlagMask; - ExecuteLine(pStr); + ExecuteLine(pStr, ClientID); m_FlagMask = Temp; } diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h index f9bd607a7..dc7d906b3 100644 --- a/src/engine/shared/console.h +++ b/src/engine/shared/console.h @@ -186,7 +186,7 @@ public: virtual bool LineIsValid(const char *pStr); virtual void ExecuteLine(const char *pStr, int ClientID = -1); - virtual void ExecuteLineFlag(const char *pStr, int FlagMask); + virtual void ExecuteLineFlag(const char *pStr, int FlagMask, int ClientID = -1); virtual void ExecuteFile(const char *pFilename, int ClientID = -1); virtual int RegisterPrintCallback(int OutputLevel, FPrintCallback pfnPrintCallback, void *pUserData);