1.1 --- a/core/ConVarManager.cpp	Sun Aug 25 11:59:48 2013 -0700
     1.2 +++ b/core/ConVarManager.cpp	Sun Aug 25 12:13:30 2013 -0700
     1.3 @@ -33,7 +33,7 @@
     1.4  #include "sm_srvcmds.h"
     1.5  #include "sm_stringutil.h"
     1.6  #include <sh_vector.h>
     1.7 -#include <sm_trie_tpl.h>
     1.8 +#include <sm_namehashset.h>
     1.9  #include "logic_bridge.h"
    1.10  
    1.11  ConVarManager g_ConVarManager;
    1.12 @@ -54,7 +54,7 @@
    1.13  
    1.14  const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
    1.15  typedef List<const ConVar *> ConVarList;
    1.16 -KTrie<ConVarInfo *> convar_cache;
    1.17 +NameHashSet<ConVarInfo *> convar_cache;
    1.18  
    1.19  class ConVarReentrancyGuard
    1.20  {
    1.21 @@ -245,16 +245,7 @@
    1.22  
    1.23  bool convar_cache_lookup(const char *name, ConVarInfo **pVar)
    1.24  {
    1.25 -	ConVarInfo **pLookup = convar_cache.retrieve(name);
    1.26 -	if (pLookup != NULL)
    1.27 -	{
    1.28 -		*pVar = *pLookup;
    1.29 -		return true;
    1.30 -	}
    1.31 -	else
    1.32 -	{
    1.33 -		return false;
    1.34 -	}
    1.35 +	return convar_cache.retrieve(name, pVar);
    1.36  }
    1.37  
    1.38  void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe)