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

Remove CPluginManager direct use of CPlugin::m_filename.

Browse Source
This commit is contained in:
David Anderson 2015-09-19 17:18:36 -07:00
parent 46c069dbbe
commit df5c53fa4a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/logic/PluginSys.cpp
View File

@ -977,7 +977,7 @@ void CPluginManager::AddPlugin(CPlugin *pPlugin)
} }
m_plugins.push_back(pPlugin); m_plugins.push_back(pPlugin);
m_LoadLookup.insert(pPlugin->m_filename, pPlugin); m_LoadLookup.insert(pPlugin->GetFilename(), pPlugin);
} }
void CPluginManager::LoadAll_SecondPass() void CPluginManager::LoadAll_SecondPass()
@ -1397,7 +1397,7 @@ void CPluginManager::UnloadPluginImpl(CPlugin *pPlugin)
{ {
/* Remove us from the lookup table and linked list */ /* Remove us from the lookup table and linked list */
m_plugins.remove(pPlugin); m_plugins.remove(pPlugin);
m_LoadLookup.remove(pPlugin->m_filename); m_LoadLookup.remove(pPlugin->GetFilename());
/* Go through our libraries and tell other plugins they're gone */ /* Go through our libraries and tell other plugins they're gone */
pPlugin->ForEachLibrary([this] (const char *lib) -> void { pPlugin->ForEachLibrary([this] (const char *lib) -> void {
@ -1897,7 +1897,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const ICommandArg
} }
else else
{ {
ke::SafeSprintf(&buffer[len], sizeof(buffer)-len, " %s", pl->m_filename); ke::SafeSprintf(&buffer[len], sizeof(buffer)-len, " %s", pl->GetFilename());
} }
rootmenu->ConsolePrint("%s", buffer); rootmenu->ConsolePrint("%s", buffer);
} }
@ -2235,7 +2235,7 @@ bool CPluginManager::ReloadPlugin(CPlugin *pl)
IPlugin *newpl; IPlugin *newpl;
int id = 1; int id = 1;
strcpy(filename, pl->m_filename); strcpy(filename, pl->GetFilename());
ptype = pl->GetType(); ptype = pl->GetType();
for (iter=m_plugins.begin(); iter!=m_plugins.end(); iter++, id++) for (iter=m_plugins.begin(); iter!=m_plugins.end(); iter++, id++)