sourcemm/concommands.cpp
changeset 97 7d3a2a8d5bf5
parent 89 79be0cd8f6c9
child 98 4c46acf7e76f
     1.1 --- a/sourcemm/concommands.cpp	Fri Aug 12 17:33:31 2005 +0000
     1.2 +++ b/sourcemm/concommands.cpp	Fri Aug 12 17:33:59 2005 +0000
     1.3 @@ -12,7 +12,8 @@
     1.4  #include "CSmmAPI.h"
     1.5  #include "concommands.h"
     1.6  #include "CPlugin.h"
     1.7 -#include <string>
     1.8 +#include "smm_string.h"
     1.9 +#include "smm_list.h"
    1.10  
    1.11  /**
    1.12   * @brief Console Command Implementations
    1.13 @@ -49,7 +50,7 @@
    1.14  
    1.15  void SMConVarAccessor::MarkCommandsAsGameDLL()
    1.16  {
    1.17 -	for (std::list<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
    1.18 +	for (List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
    1.19  		iter != m_RegisteredCommands.end(); ++iter)
    1.20  	{
    1.21  		(*iter)->AddFlags(FCVAR_GAMEDLL);
    1.22 @@ -202,7 +203,7 @@
    1.23  					CONMSG("Plugin %d is not loaded.\n", id);
    1.24  				} else {
    1.25  					CONMSG("Console commands for %s:\n", pl->m_API->GetName());
    1.26 -					std::list<ConCommandBase *>::iterator ci;
    1.27 +					List<ConCommandBase *>::iterator ci;
    1.28  					size_t count = 0;
    1.29  
    1.30  					for (ci=pl->m_Cmds.begin(); ci!=pl->m_Cmds.end(); ci++)
    1.31 @@ -233,7 +234,7 @@
    1.32  					CONMSG("Plugin %d is not loaded.\n", id);
    1.33  				} else {
    1.34  					CONMSG("Registered cvars for %s:\n", pl->m_API->GetName());
    1.35 -					std::list<ConCommandBase *>::iterator ci;
    1.36 +					List<ConCommandBase *>::iterator ci;
    1.37  					size_t count = 0;
    1.38  
    1.39  					for (ci=pl->m_Cvars.begin(); ci!=pl->m_Cvars.end(); ci++)
    1.40 @@ -461,22 +462,6 @@
    1.41  	CONMSG("  version      - Version information\n");
    1.42  }
    1.43  
    1.44 -int UTIL_CmpNocase(const std::string &s1, const std::string &s2)
    1.45 -{
    1.46 -	std::string::const_iterator p1 = s1.begin();
    1.47 -	std::string::const_iterator p2 = s2.begin();
    1.48 -
    1.49 -	while (p1 != s1.end() && p2 != s2.end())
    1.50 -	{
    1.51 -		if(toupper(*p1) != toupper(*p2))
    1.52 -			return (toupper(*p1)<toupper(*p2)) ? -1 : 1;
    1.53 -		++p1;
    1.54 -		++p2;
    1.55 -	}
    1.56 -
    1.57 -	return (s2.size() == s1.size()) ? 0 : (s1.size() < s2.size()) ? -1 : 1;	// size is unsigned
    1.58 -}
    1.59 -
    1.60  CAlwaysRegisterableCommand::CAlwaysRegisterableCommand()
    1.61  {
    1.62  	Create("", NULL, FCVAR_UNREGISTERED|FCVAR_GAMEDLL);
    1.63 @@ -504,7 +489,7 @@
    1.64  
    1.65  	while (pPtr)
    1.66  	{
    1.67 -		if (pPtr == this && pPtr->IsCommand() && UTIL_CmpNocase(GetName(), pPtr->GetName()) == 0)
    1.68 +		if (pPtr == this && pPtr->IsCommand() && stricmp(GetName(), pPtr->GetName()) == 0)
    1.69  			break;
    1.70  		ConCommandBase *pPrev = NULL;
    1.71  		while (pPtr)