Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unload all boolean to ISmmPlugin #202

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add unload all boolean to ISmmPlugin #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/ISmmPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,10 @@ namespace SourceMM
*
* @param error Error message buffer
* @param maxlen Size of error message buffer
* @param all If unloading all plugins
* @return True on success, return false to request no unload.
*/
virtual bool Unload(char *error, size_t maxlen)
virtual bool Unload(char *error, size_t maxlen, bool all)
{
return true;
}
Expand Down
12 changes: 6 additions & 6 deletions core/metamod_plugins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ bool CPluginManager::Unload(PluginId id, bool force, char *error, size_t maxlen)

bool ret;
PluginId old_id = pl->m_Id;
if ( (ret=_Unload(pl, force, error, maxlen)) == true )
if ( (ret=_Unload(pl, force, error, maxlen, false)) == true )
{
ITER_PLEVENT(OnPluginUnload, old_id);
}
Expand Down Expand Up @@ -308,7 +308,7 @@ bool CPluginManager::Retry(PluginId id, char *error, size_t len)
if (pl->m_Status >= Pl_Paused)
{
//Now it gets crazy... unload the original copy.
_Unload( (*i), true, buffer, sizeof(buffer)-1 );
_Unload( (*i), true, buffer, sizeof(buffer)-1, false );

//Set the new copy's id
pl->m_Id = id;
Expand All @@ -321,7 +321,7 @@ bool CPluginManager::Retry(PluginId id, char *error, size_t len)
else
{
//don't really care about the buffer here
_Unload(pl, true, buffer, sizeof(buffer)-1);
_Unload(pl, true, buffer, sizeof(buffer)-1, false);

//We just wasted an id... reclaim it
m_LastId--;
Expand Down Expand Up @@ -606,7 +606,7 @@ CPluginManager::CPlugin *CPluginManager::_Load(const char *file, PluginId source
return pl;
}

bool CPluginManager::_Unload(CPluginManager::CPlugin *pl, bool force, char *error, size_t maxlen)
bool CPluginManager::_Unload(CPluginManager::CPlugin *pl, bool force, char *error, size_t maxlen, bool all)
{
if (error)
{
Expand All @@ -616,7 +616,7 @@ bool CPluginManager::_Unload(CPluginManager::CPlugin *pl, bool force, char *erro
if (pl->m_API && pl->m_Lib)
{
//Note, we'll always tell the plugin it will be unloading...
if (pl->m_API->Unload(error, maxlen) || force)
if (pl->m_API->Unload(error, maxlen, all) || force)
{
pl->m_Events.clear();
UnregAllConCmds(pl);
Expand Down Expand Up @@ -720,7 +720,7 @@ bool CPluginManager::UnloadAll()

while ((i = m_Plugins.begin()) != m_Plugins.end())
{
if ( !_Unload( (*i), true, error, sizeof(error)) )
if ( !_Unload( (*i), true, error, sizeof(error), true) )
{
status = false;
}
Expand Down
2 changes: 1 addition & 1 deletion core/metamod_plugins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class CPluginManager : public ISmmPluginManager
private:
//These are identical internal functions for the wrappers above.
CPlugin *_Load(const char *file, PluginId source, char *error, size_t maxlen);
bool _Unload(CPlugin *pl, bool force, char *error, size_t maxlen);
bool _Unload(CPlugin *pl, bool force, char *error, size_t maxlen, bool all);
bool _Pause(CPlugin *pl, char *error, size_t maxlen);
bool _Unpause(CPlugin *pl, char *error, size_t maxlen);
void UnregAllConCmds(CPlugin *pl);
Expand Down
Loading