okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (bug #4357) CVAR_ROM+CVAR_ARCHIVE is not read from q3config

Browse source
This commit is contained in:
Tim Angus 2010-01-03 19:44:37 +00:00
parent a405637985
commit bb30f51f67
3 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
code/qcommon/cvar.c
View file

@ -1164,6 +1164,13 @@ void Cvar_Register(vmCvar_t *vmCvar, const char *varName, const char *defaultVal
{
cvar_t *cv;
// There is code in Cvar_Get to prevent CVAR_ROM cvars being changed by the
// user. In other words CVAR_ARCHIVE and CVAR_ROM are mutually exclusive
// flags. Unfortunately some historical game code (including single player
// baseq3) sets both flags. We unset CVAR_ROM for such cvars.
if ((flags & (CVAR_ARCHIVE | CVAR_ROM)) == (CVAR_ARCHIVE | CVAR_ROM))
flags &= ~CVAR_ROM;
cv = Cvar_Get(varName, defaultValue, flags | CVAR_VM_CREATED);
if (!vmCvar)