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

added experimental optional natives (part 1)

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401095
This commit is contained in:
Borja Ferrer
2007-07-12 02:57:43 +00:00
parent 5b8ffc08eb
commit 8a8e6ef594
6 changed files with 68 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/systems/PluginSys.cpp
+13 -2
View File
@@ -357,15 +357,19 @@ bool CPlugin::Call_AskPluginLoad(char *error, size_t maxlength)
return true;
}
m_IsInAskPluginLoad = true;
pFunction->PushCell(m_handle);
pFunction->PushCell(g_PluginSys.IsLateLoadTime() ? 1 : 0);
pFunction->PushStringEx(error, maxlength, 0, SM_PARAM_COPYBACK);
pFunction->PushCell(maxlength);
if ((err=pFunction->Execute(&result)) != SP_ERROR_NONE)
{
m_IsInAskPluginLoad = false;
return false;
}
m_IsInAskPluginLoad = false;
if (!result || m_status != Plugin_Loaded)
{
return false;
@@ -1098,7 +1102,8 @@ bool CPluginManager::RunSecondPass(CPlugin *pPlugin, char *error, size_t maxleng
break;
}
if (native->status == SP_NATIVE_UNBOUND
&& native->name[0] != '@')
&& native->name[0] != '@'
&& !(native->flags & SP_NTVFLAG_OPTIONAL))
{
if (error)
{
@@ -1176,7 +1181,7 @@ void CPluginManager::TryRefreshNatives(CPlugin *pPlugin)
{
break;
}
if (native->status == SP_NATIVE_UNBOUND)
if (native->status == SP_NATIVE_UNBOUND && !(native->flags & SP_NTVFLAG_OPTIONAL))
{
pPlugin->SetErrorState(Plugin_Error, "Native not found: %s", native->name);
return;
@@ -1213,6 +1218,12 @@ void CPluginManager::AddFakeNativesToPlugin(CPlugin *pPlugin)
native.func = pNative->func;
if (pContext->BindNative(&native) == SP_ERROR_NONE)
{
uint32_t idx;
pContext->FindNativeByName(native.name, &idx);
if (!(pPlugin->GetContext()->natives[idx].flags & SP_NTVFLAG_OPTIONAL))
{
continue;
}
/* Add us as a dependency, but we're careful not to do this circularly! */
if (pNative->ctx != pContext)
{