yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-13 00:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Videomenu: Also include crosshair_scale in the ui scale option

Browse source
This commit is contained in:
svdijk 2015-11-09 22:09:48 +01:00
parent 8d9cdc0768
commit e92b54990d
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/cl_view.c
View file

@ -620,7 +620,7 @@ V_Init(void)
Cmd_AddCommand("viewpos", V_Viewpos_f);
crosshair = Cvar_Get("crosshair", "0", CVAR_ARCHIVE);
crosshair_scale = Cvar_Get("crosshair_scale", "1", CVAR_ARCHIVE);
crosshair_scale = Cvar_Get("crosshair_scale", "-1", CVAR_ARCHIVE);
cl_testblend = Cvar_Get("cl_testblend", "0", 0);
cl_testparticles = Cvar_Get("cl_testparticles", "0", 0);
cl_testentities = Cvar_Get("cl_testentities", "0", 0);

9
src/client/menu/videomenu.c
View file

@ -36,6 +36,7 @@ static cvar_t *gl_mode;
static cvar_t *gl_hudscale;
static cvar_t *gl_consolescale;
static cvar_t *gl_menuscale;
static cvar_t *crosshair_scale;
static cvar_t *fov;
extern cvar_t *scr_viewsize;
extern cvar_t *vid_gamma;
@ -177,6 +178,7 @@ ApplyChanges(void *unused)
{
Cvar_SetValue("gl_consolescale", gl_hudscale->value);
Cvar_SetValue("gl_menuscale", gl_hudscale->value);
Cvar_SetValue("crosshair_scale", gl_hudscale->value);
}
/* Restarts automatically */
@ -300,6 +302,10 @@ VID_MenuInit(void)
{
gl_menuscale = Cvar_Get("gl_menuscale", "-1", CVAR_ARCHIVE);
}
if (!crosshair_scale)
{
crosshair_scale = Cvar_Get("crosshair_scale", "-1", CVAR_ARCHIVE);
}
if (!horplus)
{
@ -389,7 +395,8 @@ VID_MenuInit(void)
s_uiscale_list.generic.y = (y += 10);
s_uiscale_list.itemnames = uiscale_names;
if (gl_hudscale->value != gl_consolescale->value ||
gl_hudscale->value != gl_menuscale->value)
gl_hudscale->value != gl_menuscale->value ||
gl_hudscale->value != crosshair_scale->value)
{
s_uiscale_list.curvalue = 4;
}