yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-23 04:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Videomenu: Limit the ui scale option to integer values

Browse source 
Fractional values look ugly. If people really want this they can set this from the console, we won't "advise" it from the menu.
This commit is contained in:
svdijk 2015-11-08 18:20:54 +01:00
parent 0cdf927d3e
commit 8d9cdc0768
1 changed files with 12 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,31 +165,15 @@ ApplyChanges(void *unused)
/* UI scaling */ /* UI scaling */
if (s_uiscale_list.curvalue == 0) if (s_uiscale_list.curvalue == 0)
{
Cvar_SetValue("gl_hudscale", 1);
}
else if (s_uiscale_list.curvalue == 1)
{ {
Cvar_SetValue("gl_hudscale", -1); Cvar_SetValue("gl_hudscale", -1);
} }
else if (s_uiscale_list.curvalue == 2) else if (s_uiscale_list.curvalue < 4)
{ {
Cvar_SetValue("gl_hudscale", 1.5); Cvar_SetValue("gl_hudscale", s_uiscale_list.curvalue);
}
else if (s_uiscale_list.curvalue == 3)
{
Cvar_SetValue("gl_hudscale", 2);
}
else if (s_uiscale_list.curvalue == 4)
{
Cvar_SetValue("gl_hudscale", 2.5);
}
else if (s_uiscale_list.curvalue == 5)
{
Cvar_SetValue("gl_hudscale", 3);
} }
if (s_uiscale_list.curvalue != 6) if (s_uiscale_list.curvalue != 4)
{ {
Cvar_SetValue("gl_consolescale", gl_hudscale->value); Cvar_SetValue("gl_consolescale", gl_hudscale->value);
Cvar_SetValue("gl_menuscale", gl_hudscale->value); Cvar_SetValue("gl_menuscale", gl_hudscale->value);
@ -276,12 +260,10 @@ VID_MenuInit(void)
}; };
static const char *uiscale_names[] = { static const char *uiscale_names[] = {
"no (1x)",
"auto", "auto",
"1.5x", "no (1x)",
"2x", "2x",
"2.5x", "3x",
"3.0x",
"custom", "custom",
0 0
}; };
@ -409,35 +391,21 @@ VID_MenuInit(void)
if (gl_hudscale->value != gl_consolescale->value || if (gl_hudscale->value != gl_consolescale->value ||
gl_hudscale->value != gl_menuscale->value) gl_hudscale->value != gl_menuscale->value)
{ {
s_uiscale_list.curvalue = 6; s_uiscale_list.curvalue = 4;
}
else if (gl_hudscale->value == 1)
{
s_uiscale_list.curvalue = 0;
} }
else if (gl_hudscale->value < 0) else if (gl_hudscale->value < 0)
{ {
s_uiscale_list.curvalue = 1; s_uiscale_list.curvalue = 0;
} }
else if (gl_hudscale->value == 1.5f) else if (gl_hudscale->value == 1 ||
gl_hudscale->value == 2 ||
gl_hudscale->value == 3)
{ {
s_uiscale_list.curvalue = 2; s_uiscale_list.curvalue = gl_hudscale->value;
}
else if (gl_hudscale->value == 2)
{
s_uiscale_list.curvalue = 3;
}
else if (gl_hudscale->value == 2.5f)
{
s_uiscale_list.curvalue = 4;
}
else if (gl_hudscale->value == 3)
{
s_uiscale_list.curvalue = 5;
} }
else else
{ {
s_uiscale_list.curvalue = 6; s_uiscale_list.curvalue = 4;
} }
s_screensize_slider.generic.type = MTYPE_SLIDER; s_screensize_slider.generic.type = MTYPE_SLIDER;