diff options
Diffstat (limited to 'src/core/cvar.cc')
| -rw-r--r-- | src/core/cvar.cc | 5 |
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; } |