fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-11 10:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change the "screen size" slider to a scale slider

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@125 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
stevenaaus 2010-04-23 09:25:13 +00:00
parent 76bcad2d2b
commit 7334c743a0
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quakespasm/Quake/gl_screen.c
View file

@ -85,6 +85,7 @@ cvar_t scr_sbarscale = {"scr_sbarscale", "1", true};
cvar_t scr_sbaralpha = {"scr_sbaralpha", "1", true}; cvar_t scr_sbaralpha = {"scr_sbaralpha", "1", true};
cvar_t scr_conwidth = {"scr_conwidth", "0", true}; cvar_t scr_conwidth = {"scr_conwidth", "0", true};
cvar_t scr_conscale = {"scr_conscale", "1", true}; cvar_t scr_conscale = {"scr_conscale", "1", true};
cvar_t scr_scale = {"scr_scale", "1", true};
cvar_t scr_crosshaircale = {"scr_crosshaircale", "1", true}; cvar_t scr_crosshaircale = {"scr_crosshaircale", "1", true};
cvar_t scr_showfps = {"scr_showfps", "0"}; cvar_t scr_showfps = {"scr_showfps", "0"};
cvar_t scr_clock = {"scr_clock", "0"}; cvar_t scr_clock = {"scr_clock", "0"};
@ -373,6 +374,7 @@ void SCR_Init (void)
Cvar_RegisterVariable (&scr_sbaralpha, NULL); Cvar_RegisterVariable (&scr_sbaralpha, NULL);
Cvar_RegisterVariable (&scr_conwidth, &SCR_Conwidth_f); Cvar_RegisterVariable (&scr_conwidth, &SCR_Conwidth_f);
Cvar_RegisterVariable (&scr_conscale, &SCR_Conwidth_f); Cvar_RegisterVariable (&scr_conscale, &SCR_Conwidth_f);
Cvar_RegisterVariable (&scr_scale, NULL);
Cvar_RegisterVariable (&scr_crosshaircale, NULL); Cvar_RegisterVariable (&scr_crosshaircale, NULL);
Cvar_RegisterVariable (&scr_showfps, NULL); Cvar_RegisterVariable (&scr_showfps, NULL);
Cvar_RegisterVariable (&scr_clock, NULL); Cvar_RegisterVariable (&scr_clock, NULL);

27
quakespasm/Quake/menu.c
View file

@ -1048,13 +1048,16 @@ void M_AdjustSliders (int dir)
switch (options_cursor) switch (options_cursor)
{ {
case 3: // screen size case 3: // console and menu scale
scr_viewsize.value += dir * 10; scr_scale.value += dir * .2;
if (scr_viewsize.value < 30)
scr_viewsize.value = 30; if (scr_scale.value < 1)
if (scr_viewsize.value > 120) scr_scale.value = 1;
scr_viewsize.value = 120; if (scr_scale.value > 6)
Cvar_SetValue ("viewsize", scr_viewsize.value); scr_scale.value = 6;
Cvar_SetValue ("scr_scale", scr_scale.value);
Cvar_SetValue ("scr_conscale", scr_scale.value);
Cvar_SetValue ("scr_menuscale", scr_scale.value);
break; break;
case 4: // gamma case 4: // gamma
vid_gamma.value -= dir * 0.05; vid_gamma.value -= dir * 0.05;
@ -1159,12 +1162,12 @@ void M_Options_Draw (void)
p = Draw_CachePic ("gfx/p_option.lmp"); p = Draw_CachePic ("gfx/p_option.lmp");
M_DrawPic ( (320-p->width)/2, 4, p); M_DrawPic ( (320-p->width)/2, 4, p);
M_Print (16, 32, " Customize controls"); M_Print (16, 32, " Controls");
M_Print (16, 40, " Goto console"); M_Print (16, 40, " Goto console");
M_Print (16, 48, " Reset to defaults"); M_Print (16, 48, " Reset defaults");
M_Print (16, 56, " Screen size"); M_Print (16, 56, " Scale");
r = (scr_viewsize.value - 30) / (120 - 30); r = (scr_scale.value-1)/5 ; // r ranges from 0 to 1, scr_scale from 1 to 6
M_DrawSlider (220, 56, r); M_DrawSlider (220, 56, r);
M_Print (16, 64, " Brightness"); M_Print (16, 64, " Brightness");
@ -1175,7 +1178,7 @@ void M_Options_Draw (void)
r = (sensitivity.value - 1)/10; r = (sensitivity.value - 1)/10;
M_DrawSlider (220, 72, r); M_DrawSlider (220, 72, r);
M_Print (16, 80, " CD Music Volume"); M_Print (16, 80, " Music Volume");
r = bgmvolume.value; r = bgmvolume.value;
M_DrawSlider (220, 80, r); M_DrawSlider (220, 80, r);

1
quakespasm/Quake/screen.h
View file

@ -74,6 +74,7 @@ extern cvar_t scr_menuscale;
extern cvar_t scr_sbarscale; extern cvar_t scr_sbarscale;
extern cvar_t scr_conwidth; extern cvar_t scr_conwidth;
extern cvar_t scr_conscale; extern cvar_t scr_conscale;
extern cvar_t scr_scale;
extern cvar_t scr_crosshaircale; extern cvar_t scr_crosshaircale;
//johnfitz //johnfitz