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

Remove error message outparam to LoadExtensions.

Browse Source
This commit is contained in:
David Anderson 2015-09-17 13:45:57 -07:00
parent 3195dec436
commit 5eec2e7d6d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/logic/PluginSys.cpp
View File

@ -927,8 +927,7 @@ LoadRes CPluginManager::LoadPlugin(CPlugin **aResult, const char *path, bool deb
switch (result) switch (result)
{ {
case APLRes_Success: case APLRes_Success:
if (!LoadExtensions(plugin, error, maxlength)) LoadExtensions(plugin);
return LoadRes_Failure;
return LoadRes_Successful; return LoadRes_Successful;
case APLRes_Failure: case APLRes_Failure:
@ -1158,10 +1157,9 @@ bool CPlugin::ForEachExtVar(const ExtVarCallback& callback)
return true; return true;
} }
bool CPluginManager::LoadExtensions(CPlugin *pPlugin, char *error, size_t maxlength) void CPluginManager::LoadExtensions(CPlugin *pPlugin)
{ {
auto callback = [pPlugin, error, maxlength] auto callback = [pPlugin] (const sp_pubvar_t *pubvar, const CPlugin::ExtVar& ext) -> bool
(const sp_pubvar_t *pubvar, const CPlugin::ExtVar& ext) -> bool
{ {
char path[PLATFORM_MAX_PATH]; char path[PLATFORM_MAX_PATH];
/* Attempt to auto-load if necessary */ /* Attempt to auto-load if necessary */
@ -1171,7 +1169,7 @@ bool CPluginManager::LoadExtensions(CPlugin *pPlugin, char *error, size_t maxlen
} }
return true; return true;
}; };
return pPlugin->ForEachExtVar(ke::Move(callback)); pPlugin->ForEachExtVar(ke::Move(callback));
} }
bool CPluginManager::RequireExtensions(CPlugin *pPlugin, char *error, size_t maxlength) bool CPluginManager::RequireExtensions(CPlugin *pPlugin, char *error, size_t maxlength)

2
core/logic/PluginSys.h
View File

@ -485,7 +485,7 @@ private:
/** /**
* Runs an extension pass on a plugin. * Runs an extension pass on a plugin.
*/ */
bool LoadExtensions(CPlugin *pPlugin, char *error, size_t maxlength); void LoadExtensions(CPlugin *pPlugin);
bool RequireExtensions(CPlugin *pPlugin, char *error, size_t maxlength); bool RequireExtensions(CPlugin *pPlugin, char *error, size_t maxlength);
/** /**