Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-03-25 18:51:27 +0000
committerStijn Buys <ingar@osirion.org>2008-03-25 18:51:27 +0000
commita29aa1ee2935857f616351a23578311f514516d4 (patch)
tree5d9f241b0bb1facc6dc31a4ae4e26a4182641c3b /src/core/cvar.cc
parentf2c7b3846468461d3d88a797b4cc006ee4d3b624 (diff)
screenshots
Diffstat (limited to 'src/core/cvar.cc')
-rw-r--r--src/core/cvar.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/cvar.cc b/src/core/cvar.cc
index e95f61c..518ec5a 100644
--- a/src/core/cvar.cc
+++ b/src/core/cvar.cc
@@ -24,6 +24,7 @@ Cvar *Cvar::sv_framerate = 0;
Cvar *Cvar::net_host = 0;
Cvar *Cvar::net_port = 0;
Cvar *Cvar::net_maxclients = 0;
+Cvar *Cvar::net_timeout = 0;
std::map<std::string, Cvar*> Cvar::registry;
@@ -69,7 +70,7 @@ Cvar* Cvar::get(const char *name, const char *value, unsigned int flags)
registry[std::string(name)] = c;
(*c) = value;
}
- c->cvar_flags = flags;
+ c->cvar_flags |= flags;
return c;
}
@@ -84,7 +85,7 @@ Cvar* Cvar::get(const char *name, float value, unsigned int flags)
registry[std::string(name)] = c;
(*c) = value;
}
- c->cvar_flags = flags;
+ c->cvar_flags |= flags;
return c;
}