- made menu dimming a mapping option but kept the CVARS as user override.

SVN r1790 (trunk)
This commit is contained in:
Christoph Oelckers 2009-09-04 22:25:46 +00:00
commit 44974ff28f
11 changed files with 43 additions and 11 deletions

View file

@ -65,7 +65,6 @@ extern HWND Window;
EXTERN_CVAR (Bool, con_centernotify)
EXTERN_CVAR (Int, msg0color)
EXTERN_CVAR (Color, dimcolor)
EXTERN_CVAR (Color, color)
EXTERN_CVAR (Float, dimamount)
EXTERN_CVAR (Int, msgmidcolor)
@ -285,6 +284,15 @@ void FGameConfigFile::DoGlobalSetup ()
}
}
}
if (last < 209)
{
// menu dimming is now a gameinfo option so switch user override off
FBaseCVar *dim = FindCVar ("dimamount", NULL);
if (dim != NULL)
{
dim->ResetToDefault ();
}
}
}
}
}
@ -639,7 +647,6 @@ void FGameConfigFile::SetRavenDefaults (bool isHexen)
{
con_centernotify.ResetToDefault ();
msg0color.ResetToDefault ();
dimcolor.ResetToDefault ();
color.ResetToDefault ();
}
@ -650,8 +657,6 @@ void FGameConfigFile::SetRavenDefaults (bool isHexen)
snd_pitched.SetGenericRepDefault (val, CVAR_Bool);
val.Int = 9;
msg0color.SetGenericRepDefault (val, CVAR_Int);
val.Int = 0x0000ff;
dimcolor.SetGenericRepDefault (val, CVAR_Int);
val.Int = CR_WHITE;
msgmidcolor.SetGenericRepDefault (val, CVAR_Int);
val.Int = CR_YELLOW;