zone support

1 files changed, 11 insertions, 11 deletions

diff --git a/src/core/cvar.cc b/src/core/cvar.cc
index 772144f..45f04f3 100644
--- a/src/core/cvar.cc
+++ b/src/core/cvar.cc
@@ -33,7 +33,7 @@ Cvar				*Cvar::net_framerate = 0;
 
 Cvar				*Cvar::rconpassword = 0;
 
-std::map<std::string, Cvar*> 	Cvar::registry;
+Cvar::Registry 			Cvar::cvar_registry;
 
 Cvar::Cvar(const char *name, unsigned int flags)
 {
@@ -85,7 +85,7 @@ Cvar* Cvar::get(const char *name, const char *value, unsigned int flags)
 	} else {
 		//con_debug << "get " << name << " " << value << std::endl;
 		c = new Cvar(name, flags);
-		registry[std::string(name)] = c;
+		cvar_registry[std::string(name)] = c;
 		(*c) = value;
 	}
 	c->cvar_flags |= flags;
@@ -100,7 +100,7 @@ Cvar* Cvar::get(const char *name, float value, unsigned int flags)
 	} else {
 		//con_debug << "get " << name << " " << value << std::endl;
 		c = new Cvar(name, flags);
-		registry[std::string(name)] = c;
+		cvar_registry[std::string(name)] = c;
 		(*c) = value;
 	}
 	c->cvar_flags |= flags;
@@ -112,7 +112,7 @@ Cvar* Cvar::set(const char *name, const char *value, unsigned int flags)
 	Cvar *c = find(name);
 	if (!c) {
 		c = new Cvar(name, flags);
-		registry[std::string(name)] = c;
+		cvar_registry[std::string(name)] = c;
 	}
 	(*c) = value;
 	c->cvar_flags = flags;
@@ -126,7 +126,7 @@ Cvar* Cvar::set(const char *name, float value, unsigned int flags)
 	Cvar *c = find(name);
 	if (!c) {
 		c = new Cvar(name, flags);
-		registry[std::string(name)] = c;
+		cvar_registry[std::string(name)] = c;
 	}
 	(*c) = value;
 	c->cvar_flags = flags;
@@ -140,7 +140,7 @@ void Cvar::unset(std::string const &name)
 	Cvar *c = find(name);
 	if (c) {
 		con_debug << "unset " << name << std::endl;
-		registry.erase(name);
+		cvar_registry.erase(name);
 		delete c;
 	}
 }
@@ -152,8 +152,8 @@ void Cvar::unset(const char *name)
 
 Cvar *Cvar::find(std::string const &name)
 {
-	std::map<std::string, Cvar*>::iterator it = registry.find(name);
-	if (it == registry.end())
+	Registry::iterator it = cvar_registry.find(name);
+	if (it == cvar_registry.end())
 		return 0;
 	else
 		return (*it).second;
@@ -168,8 +168,8 @@ void Cvar::list()
 {
 	con_print << "Flags: A=Archive G=Game R=ReadOnly" << std::endl;
 
-	std::map<std::string, Cvar*>::iterator it;
-	for (it = registry.begin(); it != registry.end(); it++) {
+	Registry::iterator it;
+	for (it = cvar_registry.begin(); it != cvar_registry.end(); it++) {
 		std::string typeindicator;
 		if (((*it).second->flags() & Archive) == Archive)
 			typeindicator += 'A';
@@ -189,7 +189,7 @@ void Cvar::list()
 		con_print << " " << typeindicator << 
 			" " << (*it).first << " " << (*it).second->str() << " ^N" << (*it).second->info() << std::endl;
 	}
-	con_print << registry.size() << " registered variables" << std::endl;
+	con_print << cvar_registry.size() << " registered variables" << std::endl;
 }
 
 }