1.1 --- a/core/PlayerManager.cpp	Sun Mar 31 09:50:46 2013 -0700
     1.2 +++ b/core/PlayerManager.cpp	Sun Mar 31 13:30:22 2013 -0700
     1.3 @@ -783,10 +783,8 @@
     1.4  	unsigned int id = 0;
     1.5  	unsigned int start = 0;
     1.6  
     1.7 -	CVector<IExtension *> extensions;
     1.8 -	extsys->ListExtensions(&extensions);
     1.9 -
    1.10 -	if (!extensions.size())
    1.11 +	AutoExtensionList extensions(extsys);
    1.12 +	if (!extensions->size())
    1.13  	{
    1.14  		ClientConsolePrint(player->GetEdict(), "[SM] No extensions found.");
    1.15  		return;
    1.16 @@ -797,13 +795,10 @@
    1.17  		start = atoi(args.Arg(2));
    1.18  	}
    1.19  
    1.20 -	SourceHook::CVector<IExtension *>::iterator iter;
    1.21 -
    1.22 -	for (iter = extensions.begin();
    1.23 -		 iter != extensions.end();
    1.24 -		 iter++)
    1.25 +	size_t i = 0;
    1.26 +	for (; i < extensions->size(); i++)
    1.27  	{
    1.28 -		IExtension *ext = (*iter);
    1.29 +		IExtension *ext = extensions->at(i);
    1.30  
    1.31  		char error[255];
    1.32  		if (!ext->IsRunning(error, sizeof(error)))
    1.33 @@ -850,16 +845,16 @@
    1.34  		ClientConsolePrint(player->GetEdict(), "%s", buffer);
    1.35  	}
    1.36  
    1.37 -	for (; iter != extensions.end(); iter++)
    1.38 +	for (; i < extensions->size(); i++)
    1.39  	{
    1.40  		char error[255];
    1.41 -		if ((*iter)->IsRunning(error, sizeof(error)))
    1.42 +		if (extensions->at(i)->IsRunning(error, sizeof(error)))
    1.43  		{
    1.44  			break;
    1.45  		}
    1.46  	}
    1.47  
    1.48 -	if (iter != extensions.end())
    1.49 +	if (i < extensions->size())
    1.50  	{
    1.51  		ClientConsolePrint(player->GetEdict(), "To see more, type \"sm exts %d\"", id);
    1.52  	}
    1.53 @@ -872,10 +867,8 @@
    1.54  	edict_t *e = player->GetEdict();
    1.55  	unsigned int start = 0;
    1.56  
    1.57 -	CVector<SMPlugin *> plugins;
    1.58 -	scripts->ListPlugins(&plugins);
    1.59 -
    1.60 -	if (!plugins.size())
    1.61 +	AutoPluginList plugins(scripts);
    1.62 +	if (!plugins->size())
    1.63  	{
    1.64  		ClientConsolePrint(e, "[SM] No plugins found.");
    1.65  		return;
    1.66 @@ -888,10 +881,10 @@
    1.67  
    1.68  	SourceHook::List<SMPlugin *> m_FailList;
    1.69  
    1.70 -	CVector<SMPlugin *>::iterator iter = plugins.begin();
    1.71 -	for (; iter != plugins.end(); iter++)
    1.72 +	size_t i = 0;
    1.73 +	for (; i < plugins->size(); i++)
    1.74  	{
    1.75 -		SMPlugin *pl = *iter;
    1.76 +		SMPlugin *pl = plugins->at(i);
    1.77  
    1.78  		if (pl->GetStatus() != Plugin_Running)
    1.79  		{
    1.80 @@ -929,16 +922,16 @@
    1.81  	}
    1.82  
    1.83  	/* See if we can get more plugins */
    1.84 -	for (; iter != plugins.end(); iter++)
    1.85 +	for (; i < plugins->size(); i++)
    1.86  	{
    1.87 -		if ((*iter)->GetStatus() == Plugin_Running)
    1.88 +		if (plugins->at(i)->GetStatus() == Plugin_Running)
    1.89  		{
    1.90  			break;
    1.91  		}
    1.92  	}
    1.93  
    1.94  	/* Do we actually have more plugins? */
    1.95 -	if (iter != plugins.end())
    1.96 +	if (i < plugins->size())
    1.97  	{
    1.98  		ClientConsolePrint(e, "To see more, type \"sm plugins %d\"", id);
    1.99  	}