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

Merge pull request #744 from alliedmodders/show-required-exts

Browse Source 
Address issue #737
This commit is contained in:
Ruben Gonzalez 2017-12-31 11:06:35 -05:00 committed by GitHub
commit 5a35760215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/logic/ExtensionSys.cpp
View File

@ -948,20 +948,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
CExtension *pExt; CExtension *pExt;
unsigned int num = 1; unsigned int num = 1;
List<CExtension *> required; // List of loaded and required extensions switch (m_Libs.size())
List<CExtension *> optional; // List of non loaded optional extensions
for (iter = m_Libs.begin(); iter != m_Libs.end(); iter++)
{
pExt = (*iter);
if (pExt->IsLoaded() || pExt->IsRequired())
required.push_back(pExt);
else if (!pExt->IsLoaded() && !pExt->IsRequired())
optional.push_back(pExt);
}
switch (required.size())
{ {
case 1: case 1:
{ {
@ -975,11 +962,11 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
} }
default: default:
{ {
rootmenu->ConsolePrint("[SM] Displaying %d extensions:", required.size()); rootmenu->ConsolePrint("[SM] Displaying %d extensions:", m_Libs.size());
break; break;
} }
} }
for (iter = required.begin(); iter != required.end(); iter++,num++) for (iter = m_Libs.begin(); iter != m_Libs.end(); iter++,num++)
{ {
pExt = (*iter); pExt = (*iter);
if (pExt->IsLoaded()) if (pExt->IsLoaded())
@ -998,32 +985,13 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
rootmenu->ConsolePrint("[%02d] %s (%s): %s", num, name, version, descr); rootmenu->ConsolePrint("[%02d] %s (%s): %s", num, name, version, descr);
} }
} }
else else if(pExt->IsRequired() || libsys->PathExists(pExt->GetPath()))
{ {
rootmenu->ConsolePrint("[%02d] <FAILED> file \"%s\": %s", num, pExt->GetFilename(), pExt->m_Error.c_str()); rootmenu->ConsolePrint("[%02d] <FAILED> file \"%s\": %s", num, pExt->GetFilename(), pExt->m_Error.c_str());
} }
} else
if (optional.size())
{
num = 1;
switch (optional.size())
{ {
case 1: rootmenu->ConsolePrint("[%02d] <OPTIONAL> file \"%s\": %s", num, pExt->GetFilename(), pExt->m_Error.c_str());
{
rootmenu->ConsolePrint("\n[SM] Displaying 1 optional extension not found:");
break;
}
default:
{
rootmenu->ConsolePrint("\n[SM] Displaying %d optional extensions not found:", optional.size());
break;
}
}
for (iter = optional.begin(); iter != optional.end(); iter++,num++)
{
pExt = (*iter);
rootmenu->ConsolePrint("[%02d] \"%s\"", num, pExt->GetFilename());
} }
} }
return; return;