OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into merge-gzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-19 21:05:17 +02:00
commit e75e5a387b
600 changed files with 40006 additions and 59374 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/d_defcvars.cpp
View file

@ -81,17 +81,17 @@ void D_GrabCVarDefaults()
CurrentFindCVar.ToLower();
// these two got renamed
if (strcmp(CurrentFindCVar, "gamma") == 0)
if (CurrentFindCVar.Compare("gamma") == 0)
{
CurrentFindCVar = "vid_gamma";
}
if (strcmp(CurrentFindCVar, "fullscreen") == 0)
if (CurrentFindCVar.Compare("fullscreen") == 0)
{
CurrentFindCVar = "vid_fullscreen";
}
// this was removed
if (strcmp(CurrentFindCVar, "cd_drive") == 0)
if (CurrentFindCVar.Compare("cd_drive") == 0)
break;
}
if (lumpversion < 221)
@ -100,9 +100,9 @@ void D_GrabCVarDefaults()
// this one doesn't matter as much, since it depended on platform-specific values,
// and is something the user should change anyhow, so, let's just throw this value
// out.
if (strcmp(CurrentFindCVar, "mouse_sensitivity") == 0)
if (CurrentFindCVar.Compare("mouse_sensitivity") == 0)
break;
if (strcmp(CurrentFindCVar, "m_noprescale") == 0)
if (CurrentFindCVar.Compare("m_noprescale") == 0)
break;
}
@ -123,12 +123,15 @@ void D_GrabCVarDefaults()
SHOULD_BLACKLIST(vid_adapter)
SHOULD_BLACKLIST(sys_statsenabled47)
SHOULD_BLACKLIST(sys_statsenabled49)
SHOULD_BLACKLIST(anonstats_statsenabled411)
SHOULD_BLACKLIST(save_dir)
SHOULD_BLACKLIST(sys_statsport)
SHOULD_BLACKLIST(sys_statshost)
SHOULD_BLACKLIST(anonstats_port)
SHOULD_BLACKLIST(anonstats_host)
SHOULD_BLACKLIST(sentstats_hwr_done)
var = FindCVar(CurrentFindCVar, NULL);
var = FindCVar(CurrentFindCVar.GetChars(), NULL);
if (blacklisted)
{