diff -r 600e30820ea7 -r d0868271663a sourcemm/concommands.cpp --- a/sourcemm/concommands.cpp Mon Jul 23 18:19:02 2007 +0000 +++ b/sourcemm/concommands.cpp Fri Aug 10 23:43:16 2007 +0000 @@ -15,6 +15,9 @@ #include "sh_string.h" #include "sh_list.h" +using namespace SourceMM; +using namespace SourceHook; + /** * @brief Console Command Implementations * @file concommands.cpp @@ -50,7 +53,7 @@ void SMConVarAccessor::MarkCommandsAsGameDLL() { - for (SourceHook::List::iterator iter = m_RegisteredCommands.begin(); + for (List::iterator iter = m_RegisteredCommands.begin(); iter != m_RegisteredCommands.end(); ++iter) { (*iter)->AddFlags(FCVAR_GAMEDLL); @@ -61,8 +64,8 @@ { /* Notify via IMetamodListener */ PluginIter iter; - SourceMM::CPluginManager::CPlugin *pPlugin; - SourceHook::List::iterator event; + CPluginManager::CPlugin *pPlugin; + List::iterator event; IMetamodListener *pML; for (iter=g_PluginMngr._begin(); iter!=g_PluginMngr._end(); iter++) { @@ -217,65 +220,63 @@ return; } else if (strcmp(command, "list") == 0) { - SourceMM::CPluginManager::CPlugin *pl; + CPluginManager::CPlugin *pl; + ISmmPlugin *plapi; + const char *plname; PluginIter i; - const char *status=""; - const char *version=NULL; - const char *name=NULL; - const char *author=NULL; + char buffer[256]; + int len; + int plnum = g_PluginMngr.GetPluginCount(); - CONMSG("-Id- %-20.19s %-10.9s %-20.19s %-8.7s\n", "Name", "Version", "Author", "Status"); - for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++) + if (!plnum) + { + CONMSG("No plugins loaded.\n"); + return; + } else { + CONMSG("Listing %d plugin%s:\n", plnum, (plnum > 1) ? "s" : ""); + } + + for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++) { pl = (*i); if (!pl) - break; - if (pl->m_Status == Pl_Paused) { - status = "PAUSE"; - } else if (pl->m_Status == Pl_Running) { - if (pl->m_API && pl->m_API->QueryRunning(NULL, 0)) - status = "RUN"; - else - status = "STOPPED"; - } else if (pl->m_Status == Pl_Refused) { - status = "FAIL"; - } else if (pl->m_Status == Pl_Error) { - status = "ERROR"; - } else if (pl->m_Status == Pl_NotFound) { - status = "NOFILE"; + break; + } + + len = 0; + + if (pl->m_Status != Pl_Running) + { + len += UTIL_Format(buffer, sizeof(buffer), " [%02d] <%s>", pl->m_Id, g_PluginMngr.GetStatusText(pl)); + } else { + len += UTIL_Format(buffer, sizeof(buffer), " [%02d]", pl->m_Id); } - if (pl->m_API) + if ((plapi = pl->m_API)) { - version = pl->m_API->GetVersion(); - author = pl->m_API->GetAuthor(); - name = pl->m_API->GetName(); - } else { - version = "-"; - author = "-"; - name = "-"; + plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str(); + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname); + + if (IS_STR_FILLED(plapi->GetVersion())) + { + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion()); + } + if (IS_STR_FILLED(plapi->GetAuthor())) + { + UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor()); + } } - if (!version) - version = "-"; - if (!author) - author = "-"; - if (!name) - name = pl->m_File.c_str(); - - - CONMSG("[%02d] %-20.19s %-10.9s %-20.19s %-8.7s\n", pl->m_Id, name, version, author, status); + CONMSG("%s\n", buffer); } - //CONMSG("\n"); - return; } else if (strcmp(command, "cmds") == 0) { if (args >= 3) { int id = atoi(e->Cmd_Argv(2)); - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id); + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id); if (!pl) { @@ -288,7 +289,7 @@ CONMSG("Plugin %d is not loaded.\n", id); } else { CONMSG("Console commands for %s:\n", pl->m_API->GetName()); - SourceHook::List::iterator ci; + List::iterator ci; size_t count = 0; for (ci=pl->m_Cmds.begin(); ci!=pl->m_Cmds.end(); ci++) @@ -306,7 +307,7 @@ if (args >= 3) { int id = atoi(e->Cmd_Argv(2)); - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id); + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id); if (!pl) { @@ -319,7 +320,7 @@ CONMSG("Plugin %d is not loaded.\n", id); } else { CONMSG("Registered cvars for %s:\n", pl->m_API->GetName()); - SourceHook::List::iterator ci; + List::iterator ci; size_t count = 0; for (ci=pl->m_Cvars.begin(); ci!=pl->m_Cvars.end(); ci++) @@ -337,7 +338,7 @@ if (args >= 3) { int id = atoi(e->Cmd_Argv(2)); - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id); + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id); if (!pl) { CONMSG("Plugin %d not found.\n", id); @@ -446,7 +447,7 @@ char error[255]={0}; bool already; - SourceMM::CPluginManager::CPlugin *pl; + CPluginManager::CPlugin *pl; PluginId id = g_PluginMngr.Load(full_path, Pl_Console, already, error, sizeof(error)); pl = g_PluginMngr.FindById(id); @@ -493,8 +494,8 @@ CONMSG("Alias \"%s\" was not found.\n", alias); } } else { - SourceHook::List::iterator iter, end; - SourceMM::CNameAlias *p; + List::iterator iter, end; + CNameAlias *p; iter = g_PluginMngr._alias_begin(); end = g_PluginMngr._alias_end(); @@ -547,8 +548,8 @@ g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s/%s%s", g_ModPath.c_str(), file, ext); } - SourceHook::List::iterator iter, end; - SourceMM::CPluginManager::CPlugin *pl; + List::iterator iter, end; + CPluginManager::CPlugin *pl; iter = g_PluginMngr._begin(); end = g_PluginMngr._end(); for (; iter!=end; iter++) @@ -729,43 +730,47 @@ RETURN_META(MRES_SUPERCEDE); } else if(strcmp(subcmd, "list") == 0) { - SourceMM::CPluginManager::CPlugin *pl; - Pl_Status st; + CPluginManager::CPlugin *pl; + ISmmPlugin *plapi; + const char *plname; PluginIter i; - const char *version = NULL; - const char *name = NULL; - const char *author = NULL; - const char *status = NULL; + char buffer[256]; + int len = 0; + int plnum = 0; - CLIENT_CONMSG(client, "-Id- %-20.19s %-10.9s %-20.19s %6s\n", "Name", "Version", "Author", "Status"); - - for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++) + for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++, len=0) { pl = (*i); - if (!pl) - break; - - st = pl->m_Status; - - /* Only show plugins that are running or paused */ - if (pl->m_API && (st == Pl_Running || st == Pl_Paused)) + if (pl && pl->m_Status == Pl_Running) { - version = pl->m_API->GetVersion(); - author = pl->m_API->GetAuthor(); - name = pl->m_API->GetName(); + plapi = pl->m_API; + if (!plapi || !plapi->QueryRunning(NULL, 0)) + { + continue; + } + plnum++; + + len += UTIL_Format(buffer, sizeof(buffer), " [%02d]", plnum); - if (st == Pl_Running && pl->m_API->QueryRunning(NULL, 0)) + plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str(); + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname); + + if (IS_STR_FILLED(plapi->GetVersion())) { - status = "RUN"; - } else { - status = "PAUSE"; + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion()); + } + if (IS_STR_FILLED(plapi->GetAuthor())) + { + UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor()); } - if (!version || !author || !name) - break; + CLIENT_CONMSG(client, "%s\n", buffer); + } + } - CLIENT_CONMSG(client, "[%02d] %-20.19s %-10.9s %-20.19s %6s\n", pl->m_Id, name, version, author, status); - } + if (!plnum) + { + CLIENT_CONMSG(client, "No active plugins loaded.\n"); } RETURN_META(MRES_SUPERCEDE);