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

Simplify pass 2 of LoadOrRequireExtensions.

Browse Source
This commit is contained in:
David Anderson 2015-09-16 21:58:16 -07:00
parent 23290b35a7
commit e559e6ffa8
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/logic/PluginSys.cpp
View File

@ -1160,41 +1160,24 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
} }
} 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; IExtension *pExt = g_Extensions.FindExtensionByFile(path);
if ((pExt = g_Extensions.FindExtensionByFile(path)) == NULL) if (!pExt)
{
pExt = g_Extensions.FindExtensionByName(name); pExt = g_Extensions.FindExtensionByName(name);
}
/* :TODO: should we bind to unloaded extensions? if (!pExt || !pExt->IsRunning(nullptr, 0)) {
* Currently the extension manager will ignore this.
*/
if (!pExt || !pExt->IsRunning(NULL, 0))
{
if (error)
{
ke::SafeSprintf(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file); ke::SafeSprintf(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file);
}
return false; return false;
} }
else
{
g_Extensions.BindChildPlugin(pExt, pPlugin); g_Extensions.BindChildPlugin(pExt, pPlugin);
} } else {
}
else
{
IPluginFunction *pFunc;
char buffer[64]; char buffer[64];
ke::SafeSprintf(buffer, sizeof(buffer), "__ext_%s_SetNTVOptional", &pubvar->name[6]); ke::SafeSprintf(buffer, sizeof(buffer), "__ext_%s_SetNTVOptional", &pubvar->name[6]);
if ((pFunc = pBase->GetFunctionByName(buffer)) != NULL) if (IPluginFunction *pFunc = pBase->GetFunctionByName(buffer)) {
{
cell_t res; cell_t res;
if (pFunc->Execute(&res) != SP_ERROR_NONE) { if (pFunc->Execute(&res) != SP_ERROR_NONE) {
if (error)
ke::SafeSprintf(error, maxlength, "Fatal error during plugin initialization (ext req)"); ke::SafeSprintf(error, maxlength, "Fatal error during plugin initialization (ext req)");
return false; return false;
} }