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

Clean up LoadOrRequireExtensions and properly scope variables.

Browse Source
This commit is contained in:
David Anderson 2015-09-16 21:55:34 -07:00
parent 2b3da56fb5
commit 23290b35a7
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/logic/PluginSys.cpp
View File

@ -1134,13 +1134,9 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
} *ext; } *ext;
IPluginContext *pBase = pPlugin->GetBaseContext(); IPluginContext *pBase = pPlugin->GetBaseContext();
uint32_t num = pBase->GetPubVarsNum(); for (uint32_t i = 0; i < pBase->GetPubVarsNum(); i++)
sp_pubvar_t *pubvar;
IExtension *pExt;
char path[PLATFORM_MAX_PATH];
char *file, *name;
for (uint32_t i=0; i<num; i++)
{ {
sp_pubvar_t *pubvar;
if (pBase->GetPubvarByIndex(i, &pubvar) != SP_ERROR_NONE) if (pBase->GetPubvarByIndex(i, &pubvar) != SP_ERROR_NONE)
continue; continue;
@ -1148,30 +1144,26 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
continue; continue;
ext = (_ext *)pubvar->offs; ext = (_ext *)pubvar->offs;
char *file, *name;
if (pBase->LocalToString(ext->file, &file) != SP_ERROR_NONE) if (pBase->LocalToString(ext->file, &file) != SP_ERROR_NONE)
{
continue; continue;
}
if (pBase->LocalToString(ext->name, &name) != SP_ERROR_NONE) if (pBase->LocalToString(ext->name, &name) != SP_ERROR_NONE)
{
continue; continue;
}
if (pass == 1) char path[PLATFORM_MAX_PATH];
{ if (pass == 1) {
/* Attempt to auto-load if necessary */ /* Attempt to auto-load if necessary */
if (ext->autoload) if (ext->autoload) {
{
libsys->PathFormat(path, PLATFORM_MAX_PATH, "%s", file); libsys->PathFormat(path, PLATFORM_MAX_PATH, "%s", file);
bool bErrorOnMissing = ext->required ? true : false; g_Extensions.LoadAutoExtension(path, !!ext->required);
g_Extensions.LoadAutoExtension(path, bErrorOnMissing);
} }
} } else if (pass == 2) {
else if (pass == 2)
{
/* Is this required? */ /* Is this required? */
if (ext->required) if (ext->required)
{ {
libsys->PathFormat(path, PLATFORM_MAX_PATH, "%s", file); libsys->PathFormat(path, PLATFORM_MAX_PATH, "%s", file);
IExtension *pExt;
if ((pExt = g_Extensions.FindExtensionByFile(path)) == NULL) if ((pExt = g_Extensions.FindExtensionByFile(path)) == NULL)
{ {
pExt = g_Extensions.FindExtensionByName(name); pExt = g_Extensions.FindExtensionByName(name);