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

Many things:

Browse Source 
1) General code clean-up in convar manager
2) Fixed bug where convar handles were not being cached for pre-existing convars
3) Fixed bug where a convar's old value and new value were switched in the ConVarChanged hooks
4) Made convar and concmd listings more consistent, I think
5) Alphabetized convar listing
6) Minor clean-up in event manager

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40588
This commit is contained in:
Scott Ehlert 2007-03-06 23:59:25 +00:00
parent e6a127ac17
commit 0b25b6d667
9 changed files with 235 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/ConCmdManager.cpp
View File

@ -741,15 +741,18 @@ void ConCmdManager::OnRootConsoleCommand(const char *command, unsigned int argco
return; return;
} }
const sm_plugininfo_t *plinfo = pPlugin->GetPublicInfo();
const char *plname = IS_STR_FILLED(plinfo->name) ? plinfo->name : pPlugin->GetFilename();
CmdList *pList; CmdList *pList;
if (!pPlugin->GetProperty("CommandList", (void **)&pList)) if (!pPlugin->GetProperty("CommandList", (void **)&pList))
{ {
g_RootMenu.ConsolePrint("[SM] No commands found for %s", pPlugin->GetFilename()); g_RootMenu.ConsolePrint("[SM] No commands found for: %s", plname);
return; return;
} }
if (!pList->size()) if (!pList->size())
{ {
g_RootMenu.ConsolePrint("[SM] No commands found for %s", pPlugin->GetFilename()); g_RootMenu.ConsolePrint("[SM] No commands found for: %s", plname);
return; return;
} }
@ -757,10 +760,11 @@ void ConCmdManager::OnRootConsoleCommand(const char *command, unsigned int argco
const char *type = NULL; const char *type = NULL;
const char *name; const char *name;
const char *help; const char *help;
g_RootMenu.ConsolePrint(" %-17.16s %-8.7s %s", "[Name]", "[Type]", "[Help]"); g_RootMenu.ConsolePrint("[SM] Listing %d commands for: %s", pList->size(), plname);
g_RootMenu.ConsolePrint(" %-17.16s %-8.7s %s", "[Name]", "[Type]", "[Help]");
for (iter=pList->begin(); for (iter=pList->begin();
iter!=pList->end(); iter!=pList->end();
iter++) iter++, id++)
{ {
PlCmdInfo &cmd = (*iter); PlCmdInfo &cmd = (*iter);
if (cmd.type == Cmd_Server) if (cmd.type == Cmd_Server)
@ -778,7 +782,7 @@ void ConCmdManager::OnRootConsoleCommand(const char *command, unsigned int argco
} else { } else {
help = cmd.pInfo->pCmd->GetHelpText(); help = cmd.pInfo->pCmd->GetHelpText();
} }
g_RootMenu.ConsolePrint(" %-17.16s %-12.11s %s", name, type, help); g_RootMenu.ConsolePrint(" %-17.16s %-12.11s %s", name, type, help);
} }
return; return;

357
core/ConVarManager.cpp
View File

@ -21,9 +21,12 @@
ConVarManager g_ConVarManager; ConVarManager g_ConVarManager;
const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
typedef List<const ConVar *> ConVarList;
ConVarManager::ConVarManager() : m_ConVarType(0) ConVarManager::ConVarManager() : m_ConVarType(0)
{ {
// Create a convar lookup trie /* Create a convar lookup trie */
m_ConVarCache = sm_trie_create(); m_ConVarCache = sm_trie_create();
} }
@ -31,10 +34,10 @@ ConVarManager::~ConVarManager()
{ {
List<ConVarInfo *>::iterator iter; List<ConVarInfo *>::iterator iter;
// Destroy our convar lookup trie /* Destroy our convar lookup trie */
sm_trie_destroy(m_ConVarCache); sm_trie_destroy(m_ConVarCache);
// Destroy all the ConVarInfo structures /* Destroy all the ConVarInfo structures */
for (iter = m_ConVars.begin(); iter != m_ConVars.end(); iter++) for (iter = m_ConVars.begin(); iter != m_ConVars.end(); iter++)
{ {
delete (*iter); delete (*iter);
@ -47,15 +50,15 @@ void ConVarManager::OnSourceModAllInitialized()
{ {
HandleAccess sec; HandleAccess sec;
// Set up access rights for the 'ConVar' handle type /* Set up access rights for the 'ConVar' handle type */
sec.access[HandleAccess_Read] = 0; sec.access[HandleAccess_Read] = 0;
sec.access[HandleAccess_Delete] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER; sec.access[HandleAccess_Delete] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER; sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
// Create the 'ConVar' handle type /* Create the 'ConVar' handle type */
m_ConVarType = g_HandleSys.CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL); m_ConVarType = g_HandleSys.CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
// Add the 'cvars' option to the 'sm' console command /* Add the 'convars' option to the 'sm' console command */
g_RootMenu.AddRootConsoleCommand("convars", "View convars created by a plugin", this); g_RootMenu.AddRootConsoleCommand("convars", "View convars created by a plugin", this);
} }
@ -64,33 +67,33 @@ void ConVarManager::OnSourceModShutdown()
IChangeableForward *fwd; IChangeableForward *fwd;
List<ConVarInfo *>::iterator i; List<ConVarInfo *>::iterator i;
// Iterate list of ConVarInfo structures /* Iterate list of ConVarInfo structures */
for (i = m_ConVars.begin(); i != m_ConVars.end(); i++) for (i = m_ConVars.begin(); i != m_ConVars.end(); i++)
{ {
fwd = (*i)->changeForward; fwd = (*i)->changeForward;
// Free any convar-change forwards that still exist /* Free any convar-change forwards that still exist */
if (fwd) if (fwd)
{ {
g_Forwards.ReleaseForward(fwd); g_Forwards.ReleaseForward(fwd);
} }
} }
// Remove the 'cvars' option from the 'sm' console command /* Remove the 'convars' option from the 'sm' console command */
g_RootMenu.RemoveRootConsoleCommand("convars", this); g_RootMenu.RemoveRootConsoleCommand("convars", this);
// Remove the 'ConVar' handle type /* Remove the 'ConVar' handle type */
g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent); g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent);
} }
void ConVarManager::OnPluginDestroyed(IPlugin *plugin) void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
{ {
CVector<ConVar *> *cvarList; ConVarList *pConVarList;
// If plugin has a convar list, free its memory /* If plugin has a convar list, free its memory */
if (plugin->GetProperty("ConVarList", reinterpret_cast<void **>(&cvarList), true)) if (plugin->GetProperty("ConVarList", (void **)&pConVarList, true))
{ {
delete cvarList; delete pConVarList;
} }
} }
@ -99,18 +102,18 @@ void ConVarManager::OnHandleDestroy(HandleType_t type, void *object)
ConVarInfo *info; ConVarInfo *info;
ConVar *pConVar = static_cast<ConVar *>(object); ConVar *pConVar = static_cast<ConVar *>(object);
// Find convar in lookup trie /* Find convar in lookup trie */
sm_trie_retrieve(m_ConVarCache, pConVar->GetName(), reinterpret_cast<void **>(&info)); sm_trie_retrieve(m_ConVarCache, pConVar->GetName(), reinterpret_cast<void **>(&info));
// If convar was created by SourceMod plugin... /* If convar was created by SourceMod plugin... */
if (info->sourceMod) if (info->sourceMod)
{ {
// Delete string allocations /* Delete string allocations */
delete [] pConVar->GetName(); delete [] pConVar->GetName();
delete [] pConVar->GetDefault(); delete [] pConVar->GetDefault();
delete [] pConVar->GetHelpText(); delete [] pConVar->GetHelpText();
// Then unlink it from SourceMM /* Then unlink it from SourceMM */
g_SMAPI->UnregisterConCmdBase(g_PLAPI, pConVar); g_SMAPI->UnregisterConCmdBase(g_PLAPI, pConVar);
} }
} }
@ -119,78 +122,80 @@ void ConVarManager::OnRootConsoleCommand(const char *command, unsigned int argco
{ {
if (argcount >= 3) if (argcount >= 3)
{ {
int id = 1; /* Get plugin index that was passed */
int id = atoi(g_RootMenu.GetArgument(2));
// Get plugin index that was passed
int num = atoi(g_RootMenu.GetArgument(2));
// If invalid plugin index... /* Get plugin object */
if (num < 1 || num > (int)g_PluginSys.GetPluginCount()) CPlugin *plugin = g_PluginSys.GetPluginByOrder(id);
if (!plugin)
{ {
g_RootMenu.ConsolePrint("[SM] Plugin index %d not found.", num); g_RootMenu.ConsolePrint("[SM] Plugin index %d not found.", id);
return; return;
} }
// Get plugin object /* Get plugin name */
CPlugin *pl = g_PluginSys.GetPluginByOrder(num); const sm_plugininfo_t *plinfo = plugin->GetPublicInfo();
const char *plname = IS_STR_FILLED(plinfo->name) ? plinfo->name : plugin->GetFilename();
CVector<ConVar *> *cvarList = NULL; ConVarList *pConVarList;
ConVarList::iterator iter;
// Get convar list from 'ConVar' property /* If no convar list... */
pl->GetProperty("ConVar", reinterpret_cast<void **>(&cvarList)); if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
// If no cvar list...
if (cvarList == NULL)
{ {
g_RootMenu.ConsolePrint("[SM] No convars for \"%s\"", pl->GetPublicInfo()->name); g_RootMenu.ConsolePrint("[SM] No convars found for: %s", plname);
return; return;
} }
g_RootMenu.ConsolePrint("[SM] Displaying convars for \"%s\"", pl->GetPublicInfo()->name); g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
g_RootMenu.ConsolePrint(" %-32.31s %s", "[Name]", "[Value]");
// Iterate convar list and display each one /* Iterate convar list and display each one */
for (size_t i = 0; i < cvarList->size(); i++, id++) for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
{ {
ConVar *pConVar = (*cvarList)[i]; const ConVar *pConVar = (*iter);
g_RootMenu.ConsolePrint(" %02d \"%s\" = \"%s\"", id, pConVar->GetName(), pConVar->GetString()); g_RootMenu.ConsolePrint(" %-32.31s %s", pConVar->GetName(), pConVar->GetString());
} }
return; return;
} }
// Display usage of subcommand /* Display usage of subcommand */
g_RootMenu.ConsolePrint("[SM] Usage: sm convars <plugin #>"); g_RootMenu.ConsolePrint("[SM] Usage: sm convars <plugin #>");
} }
Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *helpText, int flags, bool hasMin, float min, bool hasMax, float max) Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *description, int flags, bool hasMin, float min, bool hasMax, float max)
{ {
ConVar *pConVar = NULL; ConVar *pConVar = NULL;
ConVarInfo *info = NULL; ConVarInfo *pInfo = NULL;
CVector<ConVar *> *cvarList = NULL; ConVarList *pConVarList = NULL;
Handle_t hndl = 0; Handle_t hndl = 0;
// Find out if the convar exists already /* Find out if the convar exists already */
pConVar = icvar->FindVar(name); pConVar = icvar->FindVar(name);
// If the convar already exists... /* If the convar already exists... */
if (pConVar != NULL) if (pConVar)
{ {
// First check if we already have a handle to it /* First find out if we already have a handle to it */
if (sm_trie_retrieve(m_ConVarCache, name, reinterpret_cast<void **>(&info))) if (sm_trie_retrieve(m_ConVarCache, name, (void **)&pInfo))
{ {
// If we do, then return that handle return pInfo->handle;
return info->handle;
} else { } else {
// If we don't, then create a new handle from the convar /* If we don't, then create a new handle from the convar */
hndl = g_HandleSys.CreateHandle(m_ConVarType, pConVar, NULL, g_pCoreIdent, NULL); hndl = g_HandleSys.CreateHandle(m_ConVarType, pConVar, NULL, g_pCoreIdent, NULL);
info = new ConVarInfo; /* Create and initialize ConVarInfo structure */
info->handle = hndl; pInfo = new ConVarInfo();
info->sourceMod = false; pInfo->handle = hndl;
info->changeForward = NULL; pInfo->sourceMod = false;
info->origCallback = pConVar->GetCallback(); pInfo->changeForward = NULL;
pInfo->origCallback = pConVar->GetCallback();
m_ConVars.push_back(info); /* Insert struct into caches */
m_ConVars.push_back(pInfo);
sm_trie_insert(m_ConVarCache, name, pInfo);
return hndl; return hndl;
} }
@ -201,47 +206,33 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
while (pBase) while (pBase)
{ {
if (strcmp(pBase->GetName(), name) == 0) if (pBase->IsCommand() && strcmp(pBase->GetName(), name) == 0)
{ {
return pContext->ThrowNativeError("Convar \"%s\" was not created. A console command with the same name already exists.", name); return BAD_HANDLE;
} }
pBase = const_cast<ConCommandBase *>(pBase->GetNext()); pBase = const_cast<ConCommandBase *>(pBase->GetNext());
} }
// Since we didn't find an existing convar (or concmd with the same name), now we can finally create it! /* Since an existing convar (or concmd with the same name) was not found , now we can finally create it */
pConVar = new ConVar(sm_strdup(name), sm_strdup(defaultVal), flags, sm_strdup(helpText), hasMin, min, hasMax, max); pConVar = new ConVar(sm_strdup(name), sm_strdup(defaultVal), flags, sm_strdup(description), hasMin, min, hasMax, max);
// Find plugin creating convar /* Add convar to plugin's list */
IPlugin *pl = g_PluginSys.FindPluginByContext(pContext->GetContext()); AddConVarToPluginList(pContext, pConVar);
// Get convar list from 'ConVar' property of plugin /* Create a handle from the new convar */
pl->GetProperty("ConVarList", reinterpret_cast<void **>(&cvarList));
// If 'ConVar' property doesn't exist...
if (cvarList == NULL)
{
// Then create it
cvarList = new CVector<ConVar *>;
pl->SetProperty("ConVarList", cvarList);
}
// Add new convar to plugin's list
cvarList->push_back(pConVar);
// Create a handle from the new convar
hndl = g_HandleSys.CreateHandle(m_ConVarType, pConVar, NULL, g_pCoreIdent, NULL); hndl = g_HandleSys.CreateHandle(m_ConVarType, pConVar, NULL, g_pCoreIdent, NULL);
info = new ConVarInfo; /* Create and initialize ConVarInfo structure */
info->handle = hndl; pInfo = new ConVarInfo();
info->sourceMod = true; pInfo->handle = hndl;
info->changeForward = NULL; pInfo->sourceMod = true;
info->origCallback = NULL; pInfo->changeForward = NULL;
pInfo->origCallback = NULL;
m_ConVars.push_back(info); /* Insert struct into caches */
m_ConVars.push_back(pInfo);
// Insert the handle into our lookup trie sm_trie_insert(m_ConVarCache, name, pInfo);
sm_trie_insert(m_ConVarCache, name, info);
return hndl; return hndl;
} }
@ -249,159 +240,165 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
Handle_t ConVarManager::FindConVar(const char *name) Handle_t ConVarManager::FindConVar(const char *name)
{ {
ConVar *pConVar = NULL; ConVar *pConVar = NULL;
ConVarInfo *info = NULL; ConVarInfo *pInfo;
Handle_t hndl = 0; Handle_t hndl;
// Search for convar /* Search for convar */
pConVar = icvar->FindVar(name); pConVar = icvar->FindVar(name);
// If it doesn't exist, then return an invalid handle /* If it doesn't exist, then return an invalid handle */
if (pConVar == NULL) if (!pConVar)
{ {
return BAD_HANDLE; return BAD_HANDLE;
} }
// At this point, convar exists, so find out if we already have a handle for it /* At this point, the convar exists. So, find out if we already have a handle */
if (sm_trie_retrieve(m_ConVarCache, name, reinterpret_cast<void **>(&info))) if (sm_trie_retrieve(m_ConVarCache, name, (void **)&pInfo))
{ {
// If we do, then return that handle return pInfo->handle;
return info->handle;
} }
// If we don't, then create a new handle from the convar /* If we don't have a handle, then create a new one */
hndl = g_HandleSys.CreateHandle(m_ConVarType, pConVar, NULL, g_pCoreIdent, NULL); hndl = g_HandleSys.CreateHandle(m_ConVarType, pConVar, NULL, g_pCoreIdent, NULL);
info = new ConVarInfo; /* Create and initilize ConVarInfo structure */
info->handle = hndl; pInfo = new ConVarInfo();
info->sourceMod = false; pInfo->handle = hndl;
info->changeForward = NULL; pInfo->sourceMod = false;
info->origCallback = pConVar->GetCallback(); pInfo->changeForward = NULL;
pInfo->origCallback = pConVar->GetCallback();
m_ConVars.push_back(info); /* Insert struct into our caches */
m_ConVars.push_back(pInfo);
// Insert the handle into our cache sm_trie_insert(m_ConVarCache, name, pInfo);
sm_trie_insert(m_ConVarCache, name, info);
return hndl; return hndl;
} }
void ConVarManager::HookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid) void ConVarManager::HookConVarChange(ConVar *pConVar, IPluginFunction *pFunction)
{ {
IPluginFunction *func = pContext->GetFunctionById(funcid); ConVarInfo *pInfo;
IChangeableForward *fwd = NULL; IChangeableForward *pForward;
char fwdName[64];
ConVarInfo *info = NULL;
// This shouldn't happen... /* Find the convar in the lookup trie */
if (func == NULL) if (sm_trie_retrieve(m_ConVarCache, pConVar->GetName(), (void **)&pInfo))
{ {
pContext->ThrowNativeError("Invalid function specified"); /* Get the forward */
return; pForward = pInfo->changeForward;
}
// Create a forward name /* If forward does not exist, create it */
UTIL_Format(fwdName, sizeof(fwdName), "ConVar.%s", pConVar->GetName()); if (!pForward)
// First find out if the forward already exists
g_Forwards.FindForward(fwdName, &fwd);
// If the forward doesn't exist...
if (fwd == NULL)
{
// This is the forward's parameter type list
ParamType p[] = {Param_Cell, Param_String, Param_String};
// Create the forward
fwd = g_Forwards.CreateForwardEx(fwdName, ET_Ignore, 3, p);
// Find the convar in the lookup trie
if (sm_trie_retrieve(m_ConVarCache, pConVar->GetName(), reinterpret_cast<void **>(&info)))
{ {
// Set the convar's forward to the newly created one pForward = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
info->changeForward = fwd; pInfo->changeForward = pForward;
// Set the convar's callback to our static one /* Install our own callback */
pConVar->InstallChangeCallback(OnConVarChanged); pConVar->InstallChangeCallback(OnConVarChanged);
} }
}
// Add the function to the forward's list /* Add function to forward's list */
fwd->AddFunction(func); pForward->AddFunction(pFunction);
}
} }
void ConVarManager::UnhookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid) void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFunction)
{ {
IPluginFunction *func = pContext->GetFunctionById(funcid); ConVarInfo *pInfo;
IChangeableForward *fwd = NULL; IChangeableForward *pForward;
ConVarInfo *info = NULL; IPluginContext *pContext = pFunction->GetParentContext();
// This shouldn't happen... /* Find the convar in the lookup trie */
if (func == NULL) if (sm_trie_retrieve(m_ConVarCache, pConVar->GetName(), (void **)&pInfo))
{ {
pContext->ThrowNativeError("Invalid function specified"); /* Get the forward */
return; pForward = pInfo->changeForward;
}
// Find the convar in the lookup trie /* If the forward doesn't exist, we can't unhook anything */
if (sm_trie_retrieve(m_ConVarCache, pConVar->GetName(), reinterpret_cast<void **>(&info))) if (!pForward)
{
// Get the forward
fwd = info->changeForward;
// If the forward doesn't exist, we can't unhook anything
if (fwd == NULL)
{ {
pContext->ThrowNativeError("Convar \"%s\" has no active hook", pConVar->GetName()); pContext->ThrowNativeError("Convar \"%s\" has no active hook", pConVar->GetName());
return; return;
} }
// Remove the function from the forward's list /* Remove the function from the forward's list */
if (!fwd->RemoveFunction(func)) if (!pForward->RemoveFunction(pFunction))
{ {
pContext->ThrowNativeError("Invalid hook callback specified for convar \"%s\"", pConVar->GetName()); pContext->ThrowNativeError("Invalid hook callback specified for convar \"%s\"", pConVar->GetName());
return; return;
} }
// If the forward now has 0 functions in it... /* If the forward now has 0 functions in it... */
if (fwd->GetFunctionCount() == 0) if (pForward->GetFunctionCount() == 0)
{ {
// Free this forward /* Free this forward */
g_Forwards.ReleaseForward(fwd); g_Forwards.ReleaseForward(pForward);
info->changeForward = NULL; pInfo->changeForward = NULL;
// Put the back the original convar callback /* Put back the original convar callback */
pConVar->InstallChangeCallback(info->origCallback); pConVar->InstallChangeCallback(pInfo->origCallback);
} }
} }
} }
void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar *pConVar)
{
ConVarList *pConVarList;
ConVarList::iterator iter;
bool inserted = false;
const char *orig = pConVar->GetName();
IPlugin *plugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
/* Check plugin for an existing convar list */
if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
{
pConVarList = new ConVarList();
plugin->SetProperty("ConVarList", pConVarList);
}
/* Insert convar into list which is sorted alphabetically */
for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
{
if (strcmp(orig, (*iter)->GetName()) < 0)
{
pConVarList->insert(iter, pConVar);
inserted = true;
break;
}
}
if (!inserted)
{
pConVarList->push_back(pConVar);
}
}
void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue) void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
{ {
// If the values are the same... /* If the values are the same, exit early in order to not trigger callbacks */
if (strcmp(pConVar->GetString(), oldValue) == 0) if (strcmp(pConVar->GetString(), oldValue) == 0)
{ {
// Exit early in order to not trigger callbacks
return; return;
} }
Trie *cache = g_ConVarManager.GetConVarCache(); Trie *pCache = g_ConVarManager.GetConVarCache();
ConVarInfo *info; ConVarInfo *pInfo;
// Find the convar in the lookup trie /* Find the convar in the lookup trie */
sm_trie_retrieve(cache, pConVar->GetName(), reinterpret_cast<void **>(&info)); sm_trie_retrieve(pCache, pConVar->GetName(), (void **)&pInfo);
FnChangeCallback origCallback = info->origCallback; FnChangeCallback origCallback = pInfo->origCallback;
IChangeableForward *fwd = info->changeForward; IChangeableForward *pForward = pInfo->changeForward;
// If there was a change callback installed previously, call it /* If there was a change callback installed previously, call it */
if (origCallback) if (origCallback)
{ {
origCallback(pConVar, oldValue); origCallback(pConVar, oldValue);
} }
// Now call forwards in plugins that have hooked this /* Now call forwards in plugins that have hooked this */
fwd->PushCell(info->handle); pForward->PushCell(pInfo->handle);
fwd->PushString(pConVar->GetString()); pForward->PushString(oldValue);
fwd->PushString(oldValue); pForward->PushString(pConVar->GetString());
fwd->Execute(NULL); pForward->Execute(NULL);
} }

15
core/ConVarManager.h
View File

@ -51,7 +51,7 @@ public: // SMGlobalClass
public: // IHandleTypeDispatch public: // IHandleTypeDispatch
void OnHandleDestroy(HandleType_t type, void *object); void OnHandleDestroy(HandleType_t type, void *object);
public: // IPluginsListener public: // IPluginsListener
void OnPluginDestroyed(IPlugin *plugin); void OnPluginUnloaded(IPlugin *plugin);
public: //IRootConsoleCommand public: //IRootConsoleCommand
void OnRootConsoleCommand(const char *command, unsigned int argcount); void OnRootConsoleCommand(const char *command, unsigned int argcount);
public: public:
@ -74,8 +74,8 @@ public:
/** /**
* Create a convar and return a handle to it. * Create a convar and return a handle to it.
*/ */
Handle_t CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *helpText, Handle_t CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal,
int flags, bool hasMin, float min, bool hasMax, float max); const char *description, int flags, bool hasMin, float min, bool hasMax, float max);
/** /**
* Searches for a convar and returns a handle to it * Searches for a convar and returns a handle to it
@ -85,13 +85,18 @@ public:
/** /**
* Add a function to call when the specified convar changes. * Add a function to call when the specified convar changes.
*/ */
void HookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid); void HookConVarChange(ConVar *pConVar, IPluginFunction *pFunction);
/** /**
* Remove a function from the forward that will be called when the specified convar changes. * Remove a function from the forward that will be called when the specified convar changes.
*/ */
void UnhookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid); void UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFunction);
private: private:
/**
* Adds a convar to a plugin's list.
*/
static void AddConVarToPluginList(IPluginContext *pContext, const ConVar *pConVar);
/** /**
* Static callback that Valve's ConVar class executes when the convar's value changes. * Static callback that Valve's ConVar class executes when the convar's value changes.
*/ */

6
core/EventManager.cpp
View File

@ -21,9 +21,8 @@ EventManager g_EventManager;
SH_DECL_HOOK2(IGameEventManager2, FireEvent, SH_NOATTRIB, 0, bool, IGameEvent *, bool); SH_DECL_HOOK2(IGameEventManager2, FireEvent, SH_NOATTRIB, 0, bool, IGameEvent *, bool);
typedef List<EventHook *> EventHookList;
const ParamType GAMEEVENT_PARAMS[] = {Param_Cell, Param_String, Param_Cell}; const ParamType GAMEEVENT_PARAMS[] = {Param_Cell, Param_String, Param_Cell};
typedef List<EventHook *> EventHookList;
EventManager::EventManager() : m_EventType(0), m_NotifyPlugins(true), m_EventCopy(NULL) EventManager::EventManager() : m_EventType(0), m_NotifyPlugins(true), m_EventCopy(NULL)
{ {
@ -93,12 +92,13 @@ void EventManager::OnHandleDestroy(HandleType_t type, void *object)
void EventManager::OnPluginUnloaded(IPlugin *plugin) void EventManager::OnPluginUnloaded(IPlugin *plugin)
{ {
EventHookList *pHookList; EventHookList *pHookList;
EventHookList::iterator iter;
EventHook *pHook; EventHook *pHook;
// If plugin has an event hook list... // If plugin has an event hook list...
if (plugin->GetProperty("EventHooks", reinterpret_cast<void **>(&pHookList), true)) if (plugin->GetProperty("EventHooks", reinterpret_cast<void **>(&pHookList), true))
{ {
for (EventHookList::iterator iter = pHookList->begin(); iter != pHookList->end(); iter++) for (iter = pHookList->begin(); iter != pHookList->end(); iter++)
{ {
pHook = (*iter); pHook = (*iter);

6
core/EventManager.h
View File

@ -11,8 +11,8 @@
* Version: $Id$ * Version: $Id$
*/ */
#ifndef _INCLUDE_SOURCEMOD_CGAMEEVENTMANAGER_H_ #ifndef _INCLUDE_SOURCEMOD_EVENTMANAGER_H_
#define _INCLUDE_SOURCEMOD_CGAMEEVENTMANAGER_H_ #define _INCLUDE_SOURCEMOD_EVENTMANAGER_H_
#include "sm_globals.h" #include "sm_globals.h"
#include "sourcemm_api.h" #include "sourcemm_api.h"
@ -109,4 +109,4 @@ private:
extern EventManager g_EventManager; extern EventManager g_EventManager;
#endif // _INCLUDE_SOURCEMOD_CGAMEEVENTMANAGER_H_ #endif // _INCLUDE_SOURCEMOD_EVENTMANAGER_H_

2
core/sm_stringutil.h
View File

@ -22,6 +22,8 @@ using namespace SourcePawn;
#define LANG_SERVER 0 #define LANG_SERVER 0
#define IS_STR_FILLED(var) (var[0] != '\0')
size_t atcprintf(char *buffer, size_t maxlen, const char *format, IPluginContext *pCtx, const cell_t *params, int *param); size_t atcprintf(char *buffer, size_t maxlen, const char *format, IPluginContext *pCtx, const cell_t *params, int *param);
const char *stristr(const char *str, const char *substr); const char *stristr(const char *str, const char *substr);
unsigned int strncopy(char *dest, const char *src, size_t count); unsigned int strncopy(char *dest, const char *src, size_t count);

35
core/smn_console.cpp
View File

@ -29,7 +29,7 @@ static cell_t sm_CreateConVar(IPluginContext *pContext, const cell_t *params)
// While the engine seems to accept a blank convar name, it causes a crash upon server quit // While the engine seems to accept a blank convar name, it causes a crash upon server quit
if (name == NULL || strcmp(name, "") == 0) if (name == NULL || strcmp(name, "") == 0)
{ {
return pContext->ThrowNativeError("Null or blank convar name is not allowed"); return pContext->ThrowNativeError("Convar with blank name is not permitted");
} }
pContext->LocalToString(params[2], &defaultVal); pContext->LocalToString(params[2], &defaultVal);
@ -40,7 +40,14 @@ static cell_t sm_CreateConVar(IPluginContext *pContext, const cell_t *params)
float min = sp_ctof(params[6]); float min = sp_ctof(params[6]);
float max = sp_ctof(params[8]); float max = sp_ctof(params[8]);
return g_ConVarManager.CreateConVar(pContext, name, defaultVal, helpText, params[4], hasMin, min, hasMax, max); Handle_t hndl = g_ConVarManager.CreateConVar(pContext, name, defaultVal, helpText, params[4], hasMin, min, hasMax, max);
if (hndl == BAD_HANDLE)
{
return pContext->ThrowNativeError("Convar \"%s\" was not created. A console command with the same name already exists.", name);
}
return hndl;
} }
static cell_t sm_FindConVar(IPluginContext *pContext, const cell_t *params) static cell_t sm_FindConVar(IPluginContext *pContext, const cell_t *params)
@ -49,12 +56,6 @@ static cell_t sm_FindConVar(IPluginContext *pContext, const cell_t *params)
pContext->LocalToString(params[1], &name); pContext->LocalToString(params[1], &name);
// While the engine seems to accept a blank convar name, it causes a crash upon server quit
if (name == NULL || strcmp(name, "") == 0)
{
return BAD_HANDLE;
}
return g_ConVarManager.FindConVar(name); return g_ConVarManager.FindConVar(name);
} }
@ -70,7 +71,14 @@ static cell_t sm_HookConVarChange(IPluginContext *pContext, const cell_t *params
return pContext->ThrowNativeError("Invalid convar handle %x (error %d)", hndl, err); return pContext->ThrowNativeError("Invalid convar handle %x (error %d)", hndl, err);
} }
g_ConVarManager.HookConVarChange(pContext, pConVar, static_cast<funcid_t>(params[2])); IPluginFunction *pFunction = pContext->GetFunctionById(params[2]);
if (!pFunction)
{
return pContext->ThrowNativeError("Invalid function id (%X)", params[2]);
}
g_ConVarManager.HookConVarChange(pConVar, pFunction);
return 1; return 1;
} }
@ -87,7 +95,14 @@ static cell_t sm_UnhookConVarChange(IPluginContext *pContext, const cell_t *para
return pContext->ThrowNativeError("Invalid convar handle %x (error %d)", hndl, err); return pContext->ThrowNativeError("Invalid convar handle %x (error %d)", hndl, err);
} }
g_ConVarManager.UnhookConVarChange(pContext, pConVar, static_cast<funcid_t>(params[2])); IPluginFunction *pFunction = pContext->GetFunctionById(params[2]);
if (!pFunction)
{
return pContext->ThrowNativeError("Invalid function id (%X)", params[2]);
}
g_ConVarManager.UnhookConVarChange(pConVar, pFunction);
return 1; return 1;
} }

3
core/systems/PluginSys.cpp
View File

@ -1415,7 +1415,6 @@ const char *CPluginManager::GetStatusText(PluginStatus st)
} }
} }
#define IS_STR_FILLED(var) (var[0] != '\0')
void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argcount) void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argcount)
{ {
if (argcount >= 3) if (argcount >= 3)
@ -1432,7 +1431,7 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
g_RootMenu.ConsolePrint("[SM] No plugins loaded"); g_RootMenu.ConsolePrint("[SM] No plugins loaded");
return; return;
} else { } else {
g_RootMenu.ConsolePrint("[SM] Displaying %d plugin%s:", GetPluginCount(), (plnum > 1) ? "s" : ""); g_RootMenu.ConsolePrint("[SM] Listing %d plugin%s:", GetPluginCount(), (plnum > 1) ? "s" : "");
} }
IPluginIterator *iter = GetPluginIterator(); IPluginIterator *iter = GetPluginIterator();

10
plugins/include/console.inc
View File

@ -209,7 +209,7 @@ native GetCmdArgString(String:buffer[], maxlength);
* *
* @param name Name of new convar. * @param name Name of new convar.
* @param defaultValue String containing the default value of new convar. * @param defaultValue String containing the default value of new convar.
* @param helpText Optional description of the convar. * @param description Optional description of the convar.
* @param flags Optional bitstring of flags determining how the convar should be handled. See FCVAR_* constants for more details. * @param flags Optional bitstring of flags determining how the convar should be handled. See FCVAR_* constants for more details.
* @param hasMin Optional boolean that determines if the convar has a minimum value. * @param hasMin Optional boolean that determines if the convar has a minimum value.
* @param min Minimum floating point value that the convar can have if hasMin is true. * @param min Minimum floating point value that the convar can have if hasMin is true.
@ -218,7 +218,7 @@ native GetCmdArgString(String:buffer[], maxlength);
* @return A handle to the newly created convar. If the convar already exists, INVALID_HANDLE is returned. * @return A handle to the newly created convar. If the convar already exists, INVALID_HANDLE is returned.
* @error Convar name is blank or is the same as an existing console command. * @error Convar name is blank or is the same as an existing console command.
*/ */
native Handle:CreateConVar(const String:name[], const String:defaultValue[], const String:helpText[]="", flags=0, bool:hasMin=false, Float:min=0.0, bool:hasMax=false, Float:max=0.0); native Handle:CreateConVar(const String:name[], const String:defaultValue[], const String:description[]="", flags=0, bool:hasMin=false, Float:min=0.0, bool:hasMax=false, Float:max=0.0);
/** /**
* Searches for a console variable. * Searches for a console variable.
@ -236,7 +236,7 @@ native Handle:FindConVar(const String:name[]);
* @param newValue String containing the new value of the convar. * @param newValue String containing the new value of the convar.
* @noreturn * @noreturn
*/ */
functag OnConVarChanged public(Handle:convar, const String:oldValue[], const String:newValue[]); functag ConVarChanged public(Handle:convar, const String:oldValue[], const String:newValue[]);
/** /**
* Creates a hook for when a console variable's value is changed. * Creates a hook for when a console variable's value is changed.
@ -246,7 +246,7 @@ functag OnConVarChanged public(Handle:convar, const String:oldValue[], const Str
* @noreturn * @noreturn
* @error Invalid or corrupt Handle or invalid callback function. * @error Invalid or corrupt Handle or invalid callback function.
*/ */
native HookConVarChange(Handle:convar, OnConVarChanged:callback); native HookConVarChange(Handle:convar, ConVarChanged:callback);
/** /**
* Removes a hook for when a console variable's value is changed. * Removes a hook for when a console variable's value is changed.
@ -256,7 +256,7 @@ native HookConVarChange(Handle:convar, OnConVarChanged:callback);
* @noreturn * @noreturn
* @error Invalid or corrupt Handle, invalid callback function, or no active hook on convar. * @error Invalid or corrupt Handle, invalid callback function, or no active hook on convar.
*/ */
native UnhookConVarChange(Handle:convar, OnConVarChanged:callback); native UnhookConVarChange(Handle:convar, ConVarChanged:callback);
/** /**
* Returns the boolean value of a console variable. * Returns the boolean value of a console variable.