From 4443dbc333ede61e0452da0fa2eb1fd46650359a Mon Sep 17 00:00:00 2001
From: Steven <stevenaaus@gmail.com>
Date: Fri, 23 Apr 2010 09:25:13 +0000
Subject: [PATCH] Change the "screen size" slider to a scale slider

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@125 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/gl_screen.c |  2 ++
 Quake/menu.c      | 29 ++++++++++++++++-------------
 Quake/screen.h    |  1 +
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Quake/gl_screen.c b/Quake/gl_screen.c
index 3ae0bb94..fbb893a6 100644
--- a/Quake/gl_screen.c
+++ b/Quake/gl_screen.c
@@ -85,6 +85,7 @@ cvar_t		scr_sbarscale = {"scr_sbarscale", "1", true};
 cvar_t		scr_sbaralpha = {"scr_sbaralpha", "1", true};
 cvar_t		scr_conwidth = {"scr_conwidth", "0", 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_showfps = {"scr_showfps", "0"};
 cvar_t		scr_clock = {"scr_clock", "0"};
@@ -373,6 +374,7 @@ void SCR_Init (void)
 	Cvar_RegisterVariable (&scr_sbaralpha, NULL);
 	Cvar_RegisterVariable (&scr_conwidth, &SCR_Conwidth_f);
 	Cvar_RegisterVariable (&scr_conscale, &SCR_Conwidth_f);
+	Cvar_RegisterVariable (&scr_scale, NULL);
 	Cvar_RegisterVariable (&scr_crosshaircale, NULL);
 	Cvar_RegisterVariable (&scr_showfps, NULL);
 	Cvar_RegisterVariable (&scr_clock, NULL);
diff --git a/Quake/menu.c b/Quake/menu.c
index a236000f..33ddcc3a 100644
--- a/Quake/menu.c
+++ b/Quake/menu.c
@@ -1048,13 +1048,16 @@ void M_AdjustSliders (int dir)
 
 	switch (options_cursor)
 	{
-	case 3:	// screen size
-		scr_viewsize.value += dir * 10;
-		if (scr_viewsize.value < 30)
-			scr_viewsize.value = 30;
-		if (scr_viewsize.value > 120)
-			scr_viewsize.value = 120;
-		Cvar_SetValue ("viewsize", scr_viewsize.value);
+	case 3:	// console and menu scale
+		scr_scale.value += dir * .2;
+
+		if (scr_scale.value < 1)
+			scr_scale.value = 1;
+		if (scr_scale.value > 6)
+			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;
 	case 4:	// gamma
 		vid_gamma.value -= dir * 0.05;
@@ -1159,12 +1162,12 @@ void M_Options_Draw (void)
 	p = Draw_CachePic ("gfx/p_option.lmp");
 	M_DrawPic ( (320-p->width)/2, 4, p);
 
-	M_Print (16, 32, "    Customize controls");
-	M_Print (16, 40, "         Go to console");
-	M_Print (16, 48, "     Reset to defaults");
+	M_Print (16, 32, "              Controls");
+	M_Print (16, 40, "          Goto console");
+	M_Print (16, 48, "        Reset defaults");
 
-	M_Print (16, 56, "           Screen size");
-	r = (scr_viewsize.value - 30) / (120 - 30);
+	M_Print (16, 56, "                 Scale");
+	r = (scr_scale.value-1)/5 ; // r ranges from 0 to 1, scr_scale from 1 to 6
 	M_DrawSlider (220, 56, r);
 
 	M_Print (16, 64, "            Brightness");
@@ -1175,7 +1178,7 @@ void M_Options_Draw (void)
 	r = (sensitivity.value - 1)/10;
 	M_DrawSlider (220, 72, r);
 
-	M_Print (16, 80, "       CD Music Volume");
+	M_Print (16, 80, "          Music Volume");
 	r = bgmvolume.value;
 	M_DrawSlider (220, 80, r);
 
diff --git a/Quake/screen.h b/Quake/screen.h
index 0a9864dc..a75a2125 100644
--- a/Quake/screen.h
+++ b/Quake/screen.h
@@ -74,6 +74,7 @@ extern	cvar_t		scr_menuscale;
 extern	cvar_t		scr_sbarscale;
 extern	cvar_t		scr_conwidth;
 extern	cvar_t		scr_conscale;
+extern	cvar_t		scr_scale;
 extern	cvar_t		scr_crosshaircale;
 //johnfitz