sourcemm/concommands.cpp
changeset 303 a199e9b6c67c
parent 296 ba7337defd34
child 340 a8b4a311a1e0
     1.1 --- a/sourcemm/concommands.cpp	Sat Mar 31 20:23:59 2007 +0000
     1.2 +++ b/sourcemm/concommands.cpp	Thu Apr 05 06:49:23 2007 +0000
     1.3 @@ -198,7 +198,7 @@
     1.4  			const char *name=NULL;
     1.5  			const char *author=NULL;
     1.6  
     1.7 -			CONMSG("-Id- %-20.19s  %-10.9s  %-16.15s %-8.7s\n", "Name", "Version", "Author", "Status");
     1.8 +			CONMSG("-Id- %-20.19s  %-10.9s  %-20.19s %-8.7s\n", "Name", "Version", "Author", "Status");
     1.9  			for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
    1.10  			{
    1.11  				pl = (*i);
    1.12 @@ -239,7 +239,7 @@
    1.13  					name = pl->m_File.c_str();
    1.14  
    1.15  
    1.16 -				CONMSG("[%02d] %-20.19s  %-10.9s  %-16.15s %-8.7s\n", pl->m_Id, name, version, author, status);
    1.17 +				CONMSG("[%02d] %-20.19s  %-10.9s  %-20.19s %-8.7s\n", pl->m_Id, name, version, author, status);
    1.18  			}
    1.19  
    1.20  			//CONMSG("\n");
    1.21 @@ -692,54 +692,65 @@
    1.22  				CLIENT_CONMSG(client, "  GameDLL: Scott \"Damaged Soul\" Ehlert\n");
    1.23  				CLIENT_CONMSG(client, "For more information, see the official website\n");
    1.24  				CLIENT_CONMSG(client, "http://www.sourcemm.net/\n");
    1.25 -			}
    1.26 -			else if(strcmp(subcmd, "version") == 0)
    1.27 -			{
    1.28 +
    1.29 +				RETURN_META(MRES_SUPERCEDE);
    1.30 +			} else if(strcmp(subcmd, "version") == 0) {
    1.31  				CLIENT_CONMSG(client, "Metamod:Source version %s\n", SOURCEMM_VERSION);
    1.32  				CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE);
    1.33  				CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
    1.34  				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion());
    1.35  				CLIENT_CONMSG(client, "http://www.sourcemm.net/\n");
    1.36 -			}
    1.37 -			else if(strcmp(subcmd, "list") == 0)
    1.38 -			{
    1.39 +
    1.40 +				RETURN_META(MRES_SUPERCEDE);
    1.41 +			} else if(strcmp(subcmd, "list") == 0) {
    1.42  				SourceMM::CPluginManager::CPlugin *pl;
    1.43 +				Pl_Status st;
    1.44  				PluginIter i;
    1.45 -				const char *version=NULL;
    1.46 -				const char *name=NULL;
    1.47 -				const char *author=NULL;
    1.48 +				const char *version = NULL;
    1.49 +				const char *name = NULL;
    1.50 +				const char *author = NULL;
    1.51 +				const char *status = NULL;
    1.52  
    1.53 -				CLIENT_CONMSG(client, "-Id- %-20.19s  %-10.9s  %-16.15s\n", "Name", "Version", "Author");
    1.54 +				CLIENT_CONMSG(client, "-Id- %-20.19s  %-10.9s  %-20.19s  %6s\n", "Name", "Version", "Author", "Status");
    1.55  
    1.56  				for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
    1.57  				{
    1.58  					pl = (*i);
    1.59  					if (!pl)
    1.60  						break;
    1.61 +					
    1.62 +					st = pl->m_Status;
    1.63  
    1.64 -					// Should paused plugins really show up in the list too?
    1.65 -					if (pl->m_API && (pl->m_Status == Pl_Running || pl->m_Status == Pl_Paused))
    1.66 +					/* Only show plugins that are running or paused */
    1.67 +					if (pl->m_API && (st == Pl_Running || st == Pl_Paused))
    1.68  					{
    1.69  						version = pl->m_API->GetVersion();
    1.70  						author = pl->m_API->GetAuthor();
    1.71  						name = pl->m_API->GetName();
    1.72  
    1.73 +						if (st == Pl_Running && pl->m_API->QueryRunning(NULL, 0))
    1.74 +						{
    1.75 +							status = "RUN";
    1.76 +						} else {
    1.77 +							status = "PAUSE";
    1.78 +						}
    1.79 +
    1.80  						if (!version || !author || !name)
    1.81  							break;
    1.82  
    1.83 -						CLIENT_CONMSG(client, "[%02d] %-20.19s  %-10.9s  %-16.15s\n", pl->m_Id, name, version, author);
    1.84 +						CLIENT_CONMSG(client, "[%02d] %-20.19s  %-10.9s  %-20.19s  %6s\n", pl->m_Id, name, version, author, status);
    1.85  					}
    1.86  				}
    1.87 +
    1.88 +				RETURN_META(MRES_SUPERCEDE);
    1.89  			}
    1.90  		}
    1.91 -		else
    1.92 -		{
    1.93 -			CLIENT_CONMSG(client, "Metamod:Source Menu\n");
    1.94 -			CLIENT_CONMSG(client, "usage: meta <command>\n");
    1.95 -			CLIENT_CONMSG(client, "  credits - About Metamod:Source\n");
    1.96 -			CLIENT_CONMSG(client, "  list    - List plugins\n");
    1.97 -			CLIENT_CONMSG(client, "  version - Version information\n");
    1.98 -		}
    1.99 +
   1.100 +		CLIENT_CONMSG(client, "Metamod:Source Menu\n");
   1.101 +		CLIENT_CONMSG(client, "usage: meta <command>\n");
   1.102 +		CLIENT_CONMSG(client, "  credits - About Metamod:Source\n");
   1.103 +		CLIENT_CONMSG(client, "  list    - List plugins\n");
   1.104 +		CLIENT_CONMSG(client, "  version - Version information\n");
   1.105  
   1.106  		RETURN_META(MRES_SUPERCEDE);
   1.107  	}