yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename gl_*scale to r_*scale.

Browse source
This commit is contained in:
Yamagi Burmeister 2018-01-09 09:17:46 +01:00
parent 49fae3c25c
commit ae9d7e397f
4 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/client/cl_screen.c
View file

@ -50,9 +50,9 @@ cvar_t *scr_graphscale;
cvar_t *scr_graphshift;
cvar_t *scr_drawall;
cvar_t *gl_hudscale; /* named for consistency with R1Q2 */
cvar_t *gl_consolescale;
cvar_t *gl_menuscale;
cvar_t *r_hudscale; /* named for consistency with R1Q2 */
cvar_t *r_consolescale;
cvar_t *r_menuscale;
typedef struct
{
@ -431,9 +431,9 @@ SCR_Init(void)
scr_graphscale = Cvar_Get("graphscale", "1", 0);
scr_graphshift = Cvar_Get("graphshift", "0", 0);
scr_drawall = Cvar_Get("scr_drawall", "0", 0);
gl_hudscale = Cvar_Get("gl_hudscale", "-1", CVAR_ARCHIVE);
gl_consolescale = Cvar_Get("gl_consolescale", "-1", CVAR_ARCHIVE);
gl_menuscale = Cvar_Get("gl_menuscale", "-1", CVAR_ARCHIVE);
r_hudscale = Cvar_Get("r_hudscale", "-1", CVAR_ARCHIVE);
r_consolescale = Cvar_Get("r_consolescale", "-1", CVAR_ARCHIVE);
r_menuscale = Cvar_Get("r_menuscale", "-1", CVAR_ARCHIVE);
/* register our commands */
Cmd_AddCommand("timerefresh", SCR_TimeRefresh_f);
@ -1725,17 +1725,17 @@ SCR_GetHUDScale(void)
{
scale = 1;
}
else if (gl_hudscale->value < 0)
else if (r_hudscale->value < 0)
{
scale = SCR_GetDefaultScale();
}
else if (gl_hudscale->value == 0) /* HACK: allow scale 0 to hide the HUD */
else if (r_hudscale->value == 0) /* HACK: allow scale 0 to hide the HUD */
{
scale = 0;
}
else
{
scale = SCR_ClampScale(gl_hudscale->value);
scale = SCR_ClampScale(r_hudscale->value);
}
return scale;
@ -1750,13 +1750,13 @@ SCR_GetConsoleScale(void)
{
scale = 1;
}
else if (gl_consolescale->value < 0)
else if (r_consolescale->value < 0)
{
scale = SCR_GetDefaultScale();
}
else
{
scale = SCR_ClampScale(gl_consolescale->value);
scale = SCR_ClampScale(r_consolescale->value);
}
return scale;
@ -1771,13 +1771,13 @@ SCR_GetMenuScale(void)
{
scale = 1;
}
else if (gl_menuscale->value < 0)
else if (r_menuscale->value < 0)
{
scale = SCR_GetDefaultScale();
}
else
{
scale = SCR_ClampScale(gl_menuscale->value);
scale = SCR_ClampScale(r_menuscale->value);
}
return scale;

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

@ -35,9 +35,9 @@ static cvar_t *gl_mode;
#ifdef REFSOFT
static cvar_t *sw_mode;
#endif
static cvar_t *gl_hudscale;
static cvar_t *gl_consolescale;
static cvar_t *gl_menuscale;
static cvar_t *r_hudscale;
static cvar_t *r_consolescale;
static cvar_t *r_menuscale;
static cvar_t *crosshair_scale;
static cvar_t *fov;
extern cvar_t *scr_viewsize;
@ -211,18 +211,18 @@ ApplyChanges(void *unused)
/* UI scaling */
if (s_uiscale_list.curvalue == 0)
{
Cvar_SetValue("gl_hudscale", -1);
Cvar_SetValue("r_hudscale", -1);
}
else if (s_uiscale_list.curvalue < GetCustomValue(&s_uiscale_list))
{
Cvar_SetValue("gl_hudscale", s_uiscale_list.curvalue);
Cvar_SetValue("r_hudscale", s_uiscale_list.curvalue);
}
if (s_uiscale_list.curvalue != GetCustomValue(&s_uiscale_list))
{
Cvar_SetValue("gl_consolescale", gl_hudscale->value);
Cvar_SetValue("gl_menuscale", gl_hudscale->value);
Cvar_SetValue("crosshair_scale", gl_hudscale->value);
Cvar_SetValue("r_consolescale", r_hudscale->value);
Cvar_SetValue("r_menuscale", r_hudscale->value);
Cvar_SetValue("crosshair_scale", r_hudscale->value);
}
/* Restarts automatically */
@ -373,19 +373,19 @@ VID_MenuInit(void)
}
#endif
if (!gl_hudscale)
if (!r_hudscale)
{
gl_hudscale = Cvar_Get("gl_hudscale", "-1", CVAR_ARCHIVE);
r_hudscale = Cvar_Get("r_hudscale", "-1", CVAR_ARCHIVE);
}
if (!gl_consolescale)
if (!r_consolescale)
{
gl_consolescale = Cvar_Get("gl_consolescale", "-1", CVAR_ARCHIVE);
r_consolescale = Cvar_Get("r_consolescale", "-1", CVAR_ARCHIVE);
}
if (!gl_menuscale)
if (!r_menuscale)
{
gl_menuscale = Cvar_Get("gl_menuscale", "-1", CVAR_ARCHIVE);
r_menuscale = Cvar_Get("r_menuscale", "-1", CVAR_ARCHIVE);
}
if (!crosshair_scale)
@ -481,21 +481,21 @@ VID_MenuInit(void)
s_uiscale_list.generic.x = 0;
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 != crosshair_scale->value)
if (r_hudscale->value != r_consolescale->value ||
r_hudscale->value != r_menuscale->value ||
r_hudscale->value != crosshair_scale->value)
{
s_uiscale_list.curvalue = GetCustomValue(&s_uiscale_list);
}
else if (gl_hudscale->value < 0)
else if (r_hudscale->value < 0)
{
s_uiscale_list.curvalue = 0;
}
else if (gl_hudscale->value > 0 &&
gl_hudscale->value < GetCustomValue(&s_uiscale_list) &&
gl_hudscale->value == (int)gl_hudscale->value)
else if (r_hudscale->value > 0 &&
r_hudscale->value < GetCustomValue(&s_uiscale_list) &&
r_hudscale->value == (int)r_hudscale->value)
{
s_uiscale_list.curvalue = gl_hudscale->value;
s_uiscale_list.curvalue = r_hudscale->value;
}
else
{

5
src/common/cvar.c
View file

@ -46,7 +46,10 @@ replacement_t replacements[] = {
{"gl_norefresh", "r_norefresh"},
{"gl_novis", "r_novis"},
{"gl_speeds", "r_speeds"},
{"gl_clear", "r_clear"}
{"gl_clear", "r_clear"},
{"gl_consolescale", "r_consolescale"},
{"gl_hudscale", "r_hudscale"},
{"gl_menuscale", "r_scale"}
};

2
stuff/cvarlist.md
View file

@ -104,7 +104,7 @@ Graphics (all renderers):
and `16`. Anisotropic filtering gives a huge improvement to texture
quality by a negligible performance impact.
* **gl_consolescale** / **gl_hudscale** / **gl_menuscale**, **crosshair_scale**:
* **r_consolescale** / **r_hudscale** / **r_menuscale**, **crosshair_scale**:
Scale the console, the HUD, the menu and the crosshair. The value given
is the scale factor, a factor of `1` means no scaling. Values greater
`1` make the objects bigger, values lower 1 smaller. The special value