UNLOZE/sourcemod
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the SetCommandClient hook into GameHooks.

Browse Source
This commit is contained in:
David Anderson
2015-09-09 20:03:23 -07:00
parent c54b54ded0
commit fe16e8e47c
8 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/ConCmdManager.cpp
+4 -17
View File
@@ -44,14 +44,11 @@ using namespace ke;
ConCmdManager g_ConCmds;
SH_DECL_HOOK1_void(IServerGameClients, SetCommandClient, SH_NOATTRIB, false, int);
typedef ke::LinkedList<CmdHook *> PluginHookList;
void RegisterInPlugin(CmdHook *hook);
ConCmdManager::ConCmdManager()
{
m_CmdClient = 0;
}
ConCmdManager::~ConCmdManager()
@@ -62,14 +59,11 @@ void ConCmdManager::OnSourceModAllInitialized()
{
scripts->AddPluginsListener(this);
rootmenu->AddRootConsoleCommand3("cmds", "List console commands", this);
SH_ADD_HOOK(IServerGameClients, SetCommandClient, serverClients, SH_MEMBER(this, &ConCmdManager::SetCommandClient), false);
}
void ConCmdManager::OnSourceModShutdown()
{
scripts->RemovePluginsListener(this);
/* All commands should already be removed by the time we're done */
SH_REMOVE_HOOK(IServerGameClients, SetCommandClient, serverClients, SH_MEMBER(this, &ConCmdManager::SetCommandClient), false);
rootmenu->RemoveRootConsoleCommand("cmds", this);
}
@@ -142,16 +136,11 @@ void CommandCallback(DISPATCH_ARGS)
EngineArgs args(command);
AutoEnterCommand autoEnterCommand(&args);
if (g_ConCmds.InternalDispatch(&args))
if (g_ConCmds.InternalDispatch(sCoreProviderImpl.CommandClient(), &args))
RETURN_META(MRES_SUPERCEDE);
RETURN_META(MRES_IGNORED);
}
void ConCmdManager::SetCommandClient(int client)
{
m_CmdClient = client + 1;
}
ConCmdInfo *ConCmdManager::FindInTrie(const char *name)
{
ConCmdInfo *pInfo;
@@ -218,10 +207,8 @@ ResultType ConCmdManager::DispatchClientCommand(int client, const char *cmd, int
return (ResultType)result;
}
bool ConCmdManager::InternalDispatch(const ICommandArgs *args)
bool ConCmdManager::InternalDispatch(int client, const ICommandArgs *args)
{
int client = m_CmdClient;
if (client)
{
CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
@@ -604,9 +591,9 @@ ConCmdInfo *ConCmdManager::AddOrFindCommand(const char *name, const char *descri
else
{
TrackConCommandBase(pCmd, this);
CommandHook::Callback callback = [this] (const ICommandArgs *args) -> bool {
CommandHook::Callback callback = [this] (int client, const ICommandArgs *args) -> bool {
AutoEnterCommand autoEnterCommand(args);
return this->InternalDispatch(args);
return this->InternalDispatch(client, args);
};
pInfo->sh_hook = sCoreProviderImpl.AddCommandHook(pCmd, callback);
}