X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=fd0d3a131fd289bf8656d76c6dea8f5ec811adaf;hp=e970291bff259f9aec806880d1d7940ad1159146;hb=be511c50c3e4e5fa25e56fb957690072d51314c5;hpb=cd7454f9df6b152a24c5a28750041d27023fbc1f

diff --git a/menu.c b/menu.c
index e970291b..fd0d3a13 100644
--- a/menu.c
+++ b/menu.c
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define TYPE_GAME 2
 #define TYPE_BOTH 3
 
+static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
+
 static int NehGameType;
 
 enum m_state_e m_state;
@@ -54,6 +56,7 @@ void M_Menu_Main_f (void);
 void M_Menu_LanConfig_f (void);
 void M_Menu_GameOptions_f (void);
 void M_Menu_ServerList_f (void);
+void M_Menu_ModList_f (void);
 
 static void M_Main_Draw (void);
 	static void M_SinglePlayer_Draw (void);
@@ -76,6 +79,8 @@ static void M_Main_Draw (void);
 static void M_LanConfig_Draw (void);
 static void M_GameOptions_Draw (void);
 static void M_ServerList_Draw (void);
+static void M_ModList_Draw (void);
+
 
 static void M_Main_Key (int key, char ascii);
 	static void M_SinglePlayer_Key (int key, char ascii);
@@ -98,6 +103,7 @@ static void M_Main_Key (int key, char ascii);
 static void M_LanConfig_Key (int key, char ascii);
 static void M_GameOptions_Key (int key, char ascii);
 static void M_ServerList_Key (int key, char ascii);
+static void M_ModList_Key (int key, char ascii);
 
 static qboolean	m_entersound;		// play after drawing a frame, so caching won't disrupt the sound
 
@@ -165,8 +171,8 @@ static void M_Background(int width, int height)
 	menu_height = bound(1, height, vid_conheight.integer);
 	menu_x = (vid_conwidth.integer - menu_width) * 0.5;
 	menu_y = (vid_conheight.integer - menu_height) * 0.5;
-	//DrawQ_Pic(menu_x, menu_y, NULL, menu_width, menu_height, 0, 0, 0, 0.5, 0);
-	DrawQ_Pic(0, 0, NULL, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
+	//DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+	DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
 }
 
 /*
@@ -181,30 +187,30 @@ static void M_DrawCharacter (float cx, float cy, int num)
 	char temp[2];
 	temp[0] = num;
 	temp[1] = 0;
-	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
+	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true);
 }
 
 static void M_PrintColored(float cx, float cy, const char *str)
 {
-	DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false);
 }
 
 static void M_Print(float cx, float cy, const char *str)
 {
-	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true);
 }
 
 static void M_PrintRed(float cx, float cy, const char *str)
 {
-	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true);
 }
 
 static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
 {
 	if (unghosted)
-		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true);
 	else
-		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
+		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true);
 }
 
 static void M_DrawPic(float cx, float cy, const char *picname)
@@ -212,35 +218,6 @@ static void M_DrawPic(float cx, float cy, const char *picname)
 	DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0);
 }
 
-static unsigned char identityTable[256];
-static unsigned char translationTable[256];
-
-static void M_BuildTranslationTable(int top, int bottom)
-{
-	int j;
-	unsigned char *dest, *source;
-
-	for (j = 0; j < 256; j++)
-		identityTable[j] = j;
-	dest = translationTable;
-	source = identityTable;
-	memcpy (dest, source, 256);
-
-	// LordHavoc: corrected skin color ranges
-	if (top < 128 || (top >= 224 && top < 240))	// the artists made some backwards ranges.  sigh.
-		memcpy (dest + TOP_RANGE, source + top, 16);
-	else
-		for (j=0 ; j<16 ; j++)
-			dest[TOP_RANGE+j] = source[top+15-j];
-
-	// LordHavoc: corrected skin color ranges
-	if (bottom < 128 || (bottom >= 224 && bottom < 240))
-		memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
-	else
-		for (j=0 ; j<16 ; j++)
-			dest[BOTTOM_RANGE+j] = source[bottom+15-j];
-}
-
 static void M_DrawTextBox(float x, float y, float width, float height)
 {
 	int n;
@@ -394,8 +371,6 @@ void M_Menu_Main_f (void)
 		else
 			MAIN_ITEMS = 6;
 	}
-	else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
-		MAIN_ITEMS = 6;
 	else if (gamemode == GAME_TRANSFUSION)
 	{
 		s = "gfx/menu/mainmenu1";
@@ -408,7 +383,7 @@ void M_Menu_Main_f (void)
 		MAIN_ITEMS = 5;
 
 	// check if the game data is missing and use a different main menu if so
-	m_missingdata = Draw_CachePic (s, true)->tex == r_texture_notexture;
+	m_missingdata = !forceqmenu.integer && Draw_CachePic (s, true)->tex == r_texture_notexture;
 	if (m_missingdata)
 		MAIN_ITEMS = 2;
 
@@ -623,34 +598,6 @@ static void M_Main_Key (int key, char ascii)
 				break;
 			}
 		}
-		else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
-		{
-			switch (m_main_cursor)
-			{
-			case 0:
-				M_Menu_SinglePlayer_f ();
-				break;
-
-			case 1:
-				M_Menu_MultiPlayer_f ();
-				break;
-
-			case 2:
-				M_Menu_Options_f ();
-				break;
-
-			case 3:
-				M_Menu_Help_f ();
-				break;
-
-			case 4:
-				M_Menu_Quit_f ();
-				break;
-			case 5:
-				MR_Restart();
-				break;
-			}
-		}
 		else if (gamemode == GAME_TRANSFUSION) {
 			if (MAIN_ITEMS == 7)
 			{
@@ -891,10 +838,10 @@ static void M_ScanSaves (void)
 		buf[sizeof(buf) - 1] = 0;
 		t = buf;
 		// version
-		COM_ParseTokenConsole(&t);
+		COM_ParseToken_Simple(&t, false, false);
 		version = atoi(com_token);
 		// description
-		COM_ParseTokenConsole(&t);
+		COM_ParseToken_Simple(&t, false, false);
 		strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
 
 	// change _ back to space
@@ -1344,7 +1291,7 @@ static int setup_rateindex(int rate)
 
 static void M_Setup_Draw (void)
 {
-	int i;
+	int i, j;
 	cachepic_t	*p;
 
 	M_Background(320, 200);
@@ -1372,22 +1319,28 @@ static void M_Setup_Draw (void)
 	// LordHavoc: rewrote this code greatly
 	if (menuplyr_load)
 	{
-		unsigned char *data, *f;
+		unsigned char *f;
 		fs_offset_t filesize;
 		menuplyr_load = false;
 		menuplyr_top = -1;
 		menuplyr_bottom = -1;
-		if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize)))
+		f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize);
+		if (f && filesize >= 9)
 		{
-			data = LoadLMP (f, filesize, 0, 0, true);
-			menuplyr_width = image_width;
-			menuplyr_height = image_height;
-			Mem_Free(f);
-			menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height);
-			menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height * 4);
-			memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
-			Mem_Free(data);
+			int width, height;
+			width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216;
+			height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216;
+			if (filesize >= 8 + width * height)
+			{
+				menuplyr_width = width;
+				menuplyr_height = height;
+				menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, width * height);
+				menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, width * height * 4);
+				memcpy(menuplyr_pixels, f + 8, width * height);
+			}
 		}
+		if (f)
+			Mem_Free(f);
 	}
 
 	if (menuplyr_pixels)
@@ -1396,9 +1349,26 @@ static void M_Setup_Draw (void)
 		{
 			menuplyr_top = setup_top;
 			menuplyr_bottom = setup_bottom;
-			M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16);
+
 			for (i = 0;i < menuplyr_width * menuplyr_height;i++)
-				menuplyr_translated[i] = palette_transparent[translationTable[menuplyr_pixels[i]]];
+			{
+				j = menuplyr_pixels[i];
+				if (j >= TOP_RANGE && j < TOP_RANGE + 16)
+				{
+					if (menuplyr_top < 8 || menuplyr_top == 14)
+						j = menuplyr_top * 16 + (j - TOP_RANGE);
+					else
+						j = menuplyr_top * 16 + 15-(j - TOP_RANGE);
+				}
+				else if (j >= BOTTOM_RANGE && j < BOTTOM_RANGE + 16)
+				{
+					if (menuplyr_bottom < 8 || menuplyr_bottom == 14)
+						j = menuplyr_bottom * 16 + (j - BOTTOM_RANGE);
+					else
+						j = menuplyr_bottom * 16 + 15-(j - BOTTOM_RANGE);
+				}
+				menuplyr_translated[i] = palette_bgra_transparent[j];
+			}
 			Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated);
 		}
 		M_DrawPic(160, 48, "gfx/bigbox");
@@ -1540,7 +1510,7 @@ static void M_DrawSlider (int x, int y, float num, float rangemin, float rangema
 	if (fabs((int)num - num) < 0.01)
 		sprintf(text, "%i", (int)num);
 	else
-		sprintf(text, "%.2f", num);
+		sprintf(text, "%.3f", num);
 	M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
 }
 
@@ -1553,7 +1523,9 @@ static void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 39
+//#define OPTIONS_ITEMS 25 aule was here
+#define OPTIONS_ITEMS 27
+
 
 static int options_cursor;
 
@@ -1568,61 +1540,23 @@ extern cvar_t slowmo;
 extern dllhandle_t jpeg_dll;
 extern cvar_t gl_texture_anisotropy;
 extern cvar_t r_textshadow;
+extern cvar_t r_hdr_scenebrightness;
 
 static void M_Menu_Options_AdjustSliders (int dir)
 {
 	int optnum;
+	double f;
 	S_LocalSound ("sound/misc/menu3.wav");
 
-	optnum = 7;
-	if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&sbar_alpha_bg, bound(0, sbar_alpha_bg.value + dir * 0.1, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&sbar_alpha_fg, bound(0, sbar_alpha_fg.value + dir * 0.1, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_screenshot_gammaboost, bound(0.1, scr_screenshot_gammaboost.value + dir * 0.1, 4));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&r_sky, !r_sky.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&showfps, !showfps.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&showtime, !showtime.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&showdate, !showdate.integer);
+	optnum = 0;
+	     if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 6));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&m_pitch, -m_pitch.value);
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
 	else if (options_cursor == optnum++)
 	{
 		if (cl_forwardspeed.value > 200)
@@ -1636,18 +1570,14 @@ static void M_Menu_Options_AdjustSliders (int dir)
 			Cvar_SetValueQuick (&cl_backspeed, 400);
 		}
 	}
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&lookspring, !lookspring.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&freelook, !freelook.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer);
+	else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);}
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&r_hdr_scenebrightness, bound(1, r_hdr_scenebrightness.value + dir * 0.0625, 4));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_contrast, bound(1, v_contrast.value + dir * 0.0625, 4));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_gamma, bound(0.5, v_gamma.value + dir * 0.0625, 3));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&volume, bound(0, volume.value + dir * 0.0625, 1));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&bgmvolume, bound(0, bgmvolume.value + dir * 0.0625, 1));
 }
 
 static int optnum;
@@ -1658,8 +1588,9 @@ static void M_Options_PrintCommand(const char *s, int enabled)
 {
 	if (opty >= 32)
 	{
-		DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-		M_ItemPrint(0, opty, s, enabled);
+		if (optnum == optcursor)
+			DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+		M_ItemPrint(0 + 48, opty, s, enabled);
 	}
 	opty += 8;
 	optnum++;
@@ -1669,9 +1600,10 @@ static void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
 {
 	if (opty >= 32)
 	{
-		DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-		M_ItemPrint(0, opty, s, enabled);
-		M_DrawCheckbox(0 + (int)strlen(s) * 8 + 8, opty, yes);
+		if (optnum == optcursor)
+			DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+		M_ItemPrint(0 + 48, opty, s, enabled);
+		M_DrawCheckbox(0 + 48 + (int)strlen(s) * 8 + 8, opty, yes);
 	}
 	opty += 8;
 	optnum++;
@@ -1681,9 +1613,10 @@ static void M_Options_PrintSlider(const char *s, int enabled, float value, float
 {
 	if (opty >= 32)
 	{
-		DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-		M_ItemPrint(0, opty, s, enabled);
-		M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+		if (optnum == optcursor)
+			DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+		M_ItemPrint(0 + 48, opty, s, enabled);
+		M_DrawSlider(0 + 48 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
 	}
 	opty += 8;
 	optnum++;
@@ -1705,44 +1638,33 @@ static void M_Options_Draw (void)
 	visible = (int)((menu_height - 32) / 8);
 	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8;
 
-	M_Options_PrintCommand( "Customize controls", true);
-	M_Options_PrintCommand( "     Go to console", true);
-	M_Options_PrintCommand( " Reset to defaults", true);
-	M_Options_PrintCommand( "             Video", true);
-	M_Options_PrintCommand( "           Effects", true);
-	M_Options_PrintCommand( "          Graphics", true);
-	M_Options_PrintCommand( "     Color Control", true);
-	M_Options_PrintSlider(  "  2D Screen Width ", true, vid_conwidth.value, 320, 2048);
-	M_Options_PrintSlider(  "  2D Screen Height", true, vid_conheight.value, 240, 1536);
-	M_Options_PrintSlider(  "     Console Alpha", true, scr_conalpha.value, 0, 1);
-	M_Options_PrintSlider(  "Conback Brightness", true, scr_conbrightness.value, 0, 1);
-	M_Options_PrintSlider(  "     Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
-	M_Options_PrintSlider(  "     Sbar Alpha FG", true, sbar_alpha_fg.value, 0, 1);
-	M_Options_PrintSlider(  "       Screen size", true, scr_viewsize.value, 30, 120);
-	M_Options_PrintSlider(  "     Field of View", true, scr_fov.integer, 1, 170);
-	M_Options_PrintCheckbox("  JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
-	M_Options_PrintSlider(  "      JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
-	M_Options_PrintSlider(  "  Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gammaboost.value, 0.1, 4);
-	M_Options_PrintCheckbox("               Sky", true, r_sky.integer);
-	M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
-	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
-	M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
-	M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
-	M_Options_PrintSlider(  "      Sound Volume", snd_initialized.integer, volume.value, 0, 1);
-	M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? "      Music Volume" : "    Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1);
-	M_Options_PrintCheckbox("       Text Shadow", true, r_textshadow.integer);
-	M_Options_PrintSlider(  "         Crosshair", true, crosshair.value, 0, 5);
-	M_Options_PrintSlider(  "    Crosshair Size", true, crosshair_size.value, 1, 5);
-	M_Options_PrintCheckbox("    Show Framerate", true, showfps.integer);
-	M_Options_PrintCheckbox("         Show Time", true, showtime.integer);
-	M_Options_PrintCheckbox("         Show Date", true, showdate.integer);
-	M_Options_PrintCheckbox("        Always Run", true, cl_forwardspeed.value > 200);
-	M_Options_PrintCheckbox("        Lookspring", true, lookspring.integer);
-	M_Options_PrintCheckbox("        Lookstrafe", true, lookstrafe.integer);
-	M_Options_PrintSlider(  "       Mouse Speed", true, sensitivity.value, 1, 50);
-	M_Options_PrintCheckbox("        Mouse Look", true, freelook.integer);
-	M_Options_PrintCheckbox("      Invert Mouse", true, m_pitch.value < 0);
-	M_Options_PrintCheckbox("         Use Mouse", true, vid_mouse.integer);
+	M_Options_PrintCommand( "    Customize controls", true);
+	M_Options_PrintCommand( "         Go to console", true);
+	M_Options_PrintCommand( "     Reset to defaults", true);
+	M_Options_PrintCommand( "     Change Video Mode", true);
+	M_Options_PrintSlider(  "             Crosshair", true, crosshair.value, 0, 5);
+	M_Options_PrintSlider(  "           Mouse Speed", true, sensitivity.value, 1, 50);
+	M_Options_PrintCheckbox("          Invert Mouse", true, m_pitch.value < 0);
+	M_Options_PrintSlider(  "         Field of View", true, scr_fov.integer, 1, 170);
+	M_Options_PrintCheckbox("            Always Run", true, cl_forwardspeed.value > 200);
+	M_Options_PrintCheckbox("        Show Framerate", true, showfps.integer);
+	M_Options_PrintCheckbox("    Show Date and Time", true, showdate.integer && showtime.integer);
+	M_Options_PrintCommand( "     Custom Brightness", true);
+	M_Options_PrintSlider(  "       Game Brightness", true, r_hdr_scenebrightness.value, 1, 4);
+	M_Options_PrintSlider(  "            Brightness", true, v_contrast.value, 1, 2);
+	M_Options_PrintSlider(  "                 Gamma", true, v_gamma.value, 0.5, 3);
+	M_Options_PrintSlider(  "          Sound Volume", snd_initialized.integer, volume.value, 0, 1);
+	M_Options_PrintSlider(  "          Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
+	M_Options_PrintCommand( "     Customize Effects", true);
+	M_Options_PrintCommand( "       Effects:  Quake", true);
+	M_Options_PrintCommand( "       Effects: Normal", true);
+	M_Options_PrintCommand( "       Effects:   High", true);
+	M_Options_PrintCommand( "    Customize Lighting", true);
+	M_Options_PrintCommand( "      Lighting: Flares", true);
+	M_Options_PrintCommand( "      Lighting: Normal", true);
+	M_Options_PrintCommand( "      Lighting:   High", true);
+	M_Options_PrintCommand( "      Lighting:   Full", true);
+	M_Options_PrintCommand( "           Browse Mods", true);
 }
 
 
@@ -1772,14 +1694,38 @@ static void M_Options_Key (int k, char ascii)
 		case 3:
 			M_Menu_Video_f ();
 			break;
-		case 4:
+		case 11:
+			M_Menu_Options_ColorControl_f ();
+			break;
+		case 17: // Customize Effects
 			M_Menu_Options_Effects_f ();
 			break;
-		case 5:
+		case 18: // Effects: Quake
+			Cbuf_AddText("cl_particles 1;cl_particles_quake 1;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 0;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 0;cl_beams_polygons 0;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
+			break;
+		case 19: // Effects: Normal
+			Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
+			break;
+		case 20: // Effects: High
+			Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 2;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 1;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
+			break;
+		case 21:
 			M_Menu_Options_Graphics_f ();
 			break;
-		case 6:
-			M_Menu_Options_ColorControl_f ();
+		case 22: // Lighting: Flares
+			Cbuf_AddText("r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+			break;
+		case 23: // Lighting: Normal
+			Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+			break;
+		case 24: // Lighting: High
+			Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+			break;
+		case 25: // Lighting: Full
+			Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+			break;
+		case 26:
+			M_Menu_ModList_f ();
 			break;
 		default:
 			M_Menu_Options_AdjustSliders (1);
@@ -1811,7 +1757,7 @@ static void M_Options_Key (int k, char ascii)
 	}
 }
 
-#define	OPTIONS_EFFECTS_ITEMS	36
+#define	OPTIONS_EFFECTS_ITEMS	34
 
 static int options_effects_cursor;
 
@@ -1846,9 +1792,7 @@ static void M_Menu_Options_Effects_AdjustSliders (int dir)
 	S_LocalSound ("sound/misc/menu3.wav");
 
 	optnum = 0;
-	     if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
-	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
-	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+	     if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quake, !cl_particles_quake.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
@@ -1900,8 +1844,6 @@ static void M_Options_Effects_Draw (void)
 	visible = (int)((menu_height - 32) / 8);
 	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
 
-	M_Options_PrintSlider(  "      Corona Intensity", true, r_coronas.value, 0, 4);
-	M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
 	M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
 	M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer);
 	M_Options_PrintSlider(  "     Particles Quality", true, cl_particles_quality.value, 1, 4);
@@ -1976,7 +1918,7 @@ static void M_Options_Effects_Key (int k, char ascii)
 }
 
 
-#define	OPTIONS_GRAPHICS_ITEMS	18
+#define	OPTIONS_GRAPHICS_ITEMS	20
 
 static int options_graphics_cursor;
 
@@ -1991,18 +1933,19 @@ extern cvar_t r_shadow_gloss;
 extern cvar_t r_shadow_realtime_dlight;
 extern cvar_t r_shadow_realtime_dlight_shadows;
 extern cvar_t r_shadow_realtime_world;
-extern cvar_t r_shadow_realtime_world_dlightshadows;
 extern cvar_t r_shadow_realtime_world_lightmaps;
 extern cvar_t r_shadow_realtime_world_shadows;
 extern cvar_t r_bloom;
-extern cvar_t r_bloom_intensity;
-extern cvar_t r_bloom_power;
+extern cvar_t r_bloom_colorscale;
+extern cvar_t r_bloom_colorsubtract;
+extern cvar_t r_bloom_colorexponent;
 extern cvar_t r_bloom_blur;
+extern cvar_t r_bloom_brighten;
 extern cvar_t r_bloom_resolution;
 extern cvar_t r_hdr;
-extern cvar_t r_hdr_bloomintensity;
 extern cvar_t r_hdr_scenebrightness;
 extern cvar_t r_hdr_glowintensity;
+extern cvar_t r_hdr_range;
 extern cvar_t gl_picmip;
 
 static void M_Menu_Options_Graphics_AdjustSliders (int dir)
@@ -2012,23 +1955,25 @@ static void M_Menu_Options_Graphics_AdjustSliders (int dir)
 
 	optnum = 0;
 
-		 if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss,							bound(0, r_shadow_gloss.integer + dir, 2));
+	     if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss,							bound(0, r_shadow_gloss.integer + dir, 2));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight,				!r_shadow_realtime_dlight.integer);
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows,		!r_shadow_realtime_dlight_shadows.integer);
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world,					!r_shadow_realtime_world.integer);
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows,	!r_shadow_realtime_world_dlightshadows.integer);
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps,		bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows,			!r_shadow_realtime_world_shadows.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness,                   bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom,                                 !r_bloom.integer);
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr,                                   !r_hdr.integer);
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_bloomintensity,                    bound(0.125, r_hdr_bloomintensity.value + dir * 0.125, 4));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_range,                             bound(1, r_hdr_range.value + dir * 0.25, 16));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_glowintensity,                     bound(0, r_hdr_glowintensity.value + dir * 0.25, 4));
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_power,                           bound(1, r_bloom_power.value + dir * 1, 16));
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_intensity,                       bound(1, r_bloom_intensity.value + dir * 0.25, 16));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorscale,                      bound(0.0625, r_bloom_colorscale.value + dir * 0.0625, 1));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorsubtract,                   bound(0, r_bloom_colorsubtract.value + dir * 0.0625, 1-0.0625));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent,                   bound(1, r_bloom_colorexponent.value * (dir > 0 ? 2.0 : 0.5), 8));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_brighten,                        bound(1, r_bloom_brighten.value + dir * 0.0625, 4));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_blur,                            bound(1, r_bloom_blur.value + dir * 1, 16));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_resolution,                      bound(64, r_bloom_resolution.value + dir * 64, 2048));
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness,                   bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4));
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_picmip,                               bound(0, gl_picmip.value - dir, 3));
 	else if (options_graphics_cursor == optnum++) Cbuf_AddText ("r_restart\n");
 }
 
@@ -2049,24 +1994,26 @@ static void M_Options_Graphics_Draw (void)
 	visible = (int)((menu_height - 32) / 8);
 	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
 
-	M_Options_PrintSlider(  "             Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
-	M_Options_PrintCheckbox("             RT DLights", true, r_shadow_realtime_dlight.integer);
-	M_Options_PrintCheckbox("      RT DLight Shadows", true, r_shadow_realtime_dlight_shadows.integer);
-	M_Options_PrintCheckbox("               RT World", true, r_shadow_realtime_world.integer);
-	M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
-	M_Options_PrintSlider(  "     RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
-	M_Options_PrintCheckbox("        RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
-	M_Options_PrintCheckbox("           Bloom Effect", !r_hdr.integer, r_bloom.integer);
-	M_Options_PrintCheckbox("       HDR Bloom Effect", r_hdr.integer, r_hdr.integer);
-	M_Options_PrintSlider(  "    HDR Bloom Intensity", r_hdr.integer, r_hdr_bloomintensity.value, 0.125, 4);
-	M_Options_PrintSlider(  "     HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4);
-	M_Options_PrintSlider(  "Non-HDR Bloom Darkening", !r_hdr.integer && r_bloom.integer, r_bloom_power.value, 1, 16);
-	M_Options_PrintSlider(  "        Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_intensity.value, 1, 16);
-	M_Options_PrintSlider(  "             Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16);
-	M_Options_PrintSlider(  "       Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048);
-	M_Options_PrintSlider(  "       Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
-	M_Options_PrintSlider(  "        Texture Quality", true, gl_picmip.value, 3, 0);
-	M_Options_PrintCommand( "       Restart Renderer", true);
+	M_Options_PrintSlider(  "      Corona Intensity", true, r_coronas.value, 0, 4);
+	M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
+	M_Options_PrintSlider(  "            Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
+	M_Options_PrintCheckbox("            RT DLights", !gl_flashblend.integer, r_shadow_realtime_dlight.integer);
+	M_Options_PrintCheckbox("     RT DLight Shadows", !gl_flashblend.integer, r_shadow_realtime_dlight_shadows.integer);
+	M_Options_PrintCheckbox("              RT World", true, r_shadow_realtime_world.integer);
+	M_Options_PrintSlider(  "    RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
+	M_Options_PrintCheckbox("       RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
+	M_Options_PrintSlider(  "      Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
+	M_Options_PrintCheckbox("          Bloom Effect", !r_hdr.integer, r_bloom.integer);
+	M_Options_PrintCheckbox("      HDR Bloom Effect", true, r_hdr.integer);
+	M_Options_PrintSlider(  "     HDR Dynamic Range", r_hdr.integer, r_hdr_range.value, 1, 16);
+	M_Options_PrintSlider(  "    HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4);
+	M_Options_PrintSlider(  "     Bloom Color Scale", r_hdr.integer || r_bloom.integer, r_bloom_colorscale.value, 0.0625, 1);
+	M_Options_PrintSlider(  "  Bloom Color Subtract", r_hdr.integer || r_bloom.integer, r_bloom_colorsubtract.value, 0, 1-0.0625);
+	M_Options_PrintSlider(  "  Bloom Color Exponent", r_hdr.integer || r_bloom.integer, r_bloom_colorexponent.value, 1, 8);
+	M_Options_PrintSlider(  "       Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_brighten.value, 1, 4);
+	M_Options_PrintSlider(  "            Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16);
+	M_Options_PrintSlider(  "      Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048);
+	M_Options_PrintCommand( "      Restart Renderer", true);
 }
 
 
@@ -2260,7 +2207,7 @@ static void M_Options_ColorControl_Draw (void)
 	M_Options_PrintSlider(  "          White: Grey ", v_color_enable.integer, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);
 
 	opty += 4;
-	DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
+	DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
 	s = (float) 312 / 2 * vid.width / vid_conwidth.integer;
 	t = (float) 4 / 2 * vid.height / vid_conheight.integer;
 	DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
@@ -2279,19 +2226,19 @@ static void M_Options_ColorControl_Draw (void)
 	v = t * 0.5;
 	opty += 8;
 	x = 4;
-	DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, 0, 0, 1, 0);
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0);
 	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
 	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
 	x += 80;
-	DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, c, 0, 1, 0);
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0);
 	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
 	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
 	x += 80;
-	DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, 0, c, 1, 0);
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0);
 	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
 	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
 	x += 80;
-	DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, c, c, 1, 0);
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0);
 	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
 	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
 }
@@ -2505,8 +2452,8 @@ static void M_AddBindToCategory(bindcategory_t *c, char *command, char *descript
 	*b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1);
 	*b->command = (char *)((*b) + 1);
 	*b->description = *b->command + strlen(command) + 1;
-	strcpy(*b->command, command);
-	strcpy(*b->description, description);
+	strlcpy(*b->command, command, strlen(command) + 1);
+	strlcpy(*b->description, description, strlen(description) + 1);
 }
 
 static void M_AddBind (char *category, char *command, char *description)
@@ -2781,14 +2728,6 @@ static void M_Reset_Draw (void)
 /* VIDEO MENU */
 
 // note: if modes are added to the beginning of this list, update VID_DEFAULT
-typedef struct video_resolution_s
-{
-	const char *type;
-	int width, height;
-	int conwidth, conheight;
-	double pixelheight; // pixel aspect
-}
-video_resolution_t;
 video_resolution_t video_resolutions[] =
 {
 {"Standard 4x3"              ,  320, 240, 320, 240, 1     },
@@ -2852,9 +2791,9 @@ video_resolution_t video_resolutions[] =
 #define VID_DEFAULT 3
 #define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
 
-#define VIDEO_ITEMS 7
+#define VIDEO_ITEMS 10
 static int video_cursor = 0;
-static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
+static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162, 170, 178, 186};
 static int video_resolution;
 
 void M_Menu_Video_f (void)
@@ -2940,6 +2879,15 @@ static void M_Video_Draw (void)
 	M_ItemPrint(16, video_cursor_table[6], "         Vertical Sync", gl_videosyncavailable);
 	M_DrawCheckbox(220, video_cursor_table[6], vid_vsync.integer);
 
+	M_ItemPrint(16, video_cursor_table[7], "    Anisotropic Filter", gl_support_anisotropy);
+	M_DrawSlider(220, video_cursor_table[7], gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
+
+	M_ItemPrint(16, video_cursor_table[8], "       Texture Quality", true);
+	M_DrawSlider(220, video_cursor_table[8], gl_picmip.value, 3, 0);
+
+	M_ItemPrint(16, video_cursor_table[9], "   Texture Compression", gl_support_texture_compression);
+	M_DrawCheckbox(220, video_cursor_table[9], gl_texturecompression.integer);
+
 	// Cursor
 	M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
 }
@@ -2983,6 +2931,15 @@ static void M_Menu_Video_AdjustSliders (int dir)
 		case 6:
 			Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
 			break;
+		case 7:
+			Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy));
+			break;
+		case 8:
+			Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
+			break;
+		case 9:
+			Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
+			break;
 	}
 }
 
@@ -3298,7 +3255,7 @@ void M_Menu_LanConfig_f (void)
 	if (StartingGame)
 		lanConfig_cursor = 1;
 	lanConfig_port = 26000;
-	sprintf(lanConfig_portname, "%u", lanConfig_port);
+	sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
 
 	M_Update_Return_Reason("");
 }
@@ -3464,7 +3421,7 @@ static void M_LanConfig_Key (int key, char ascii)
 	l =  atoi(lanConfig_portname);
 	if (l <= 65535)
 		lanConfig_port = l;
-	sprintf(lanConfig_portname, "%u", lanConfig_port);
+	sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
 }
 
 //=============================================================================
@@ -4230,8 +4187,6 @@ static void M_NetStart_Change (int dir)
 
 	case 8:
 		Cvar_SetValueQuick (&sv_maxrate, sv_maxrate.integer + dir*500);
-		if (sv_maxrate.integer > NET_MAXRATE)
-			Cvar_SetValueQuick (&sv_maxrate, NET_MAXRATE);
 		if (sv_maxrate.integer < NET_MINRATE)
 			Cvar_SetValueQuick (&sv_maxrate, NET_MINRATE);
 		break;
@@ -4400,7 +4355,7 @@ static void M_ServerList_Draw (void)
 	{
 		for (n = start;n < end;n++)
 		{
-			DrawQ_Pic(menu_x, menu_y + y, NULL, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+			DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
 			M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
 			M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
 		}
@@ -4465,6 +4420,233 @@ static void M_ServerList_Key(int k, char ascii)
 
 }
 
+//=============================================================================
+/* MODLIST MENU */
+// same limit of mod dirs as in fs.c
+#define MODLIST_MAXDIRS 16
+static int modlist_enabled [MODLIST_MAXDIRS];	//array of indexs to modlist
+static int modlist_numenabled;			//number of enabled (or in process to be..) mods
+
+typedef struct modlist_entry_s
+{
+	qboolean loaded;	// used to determine whether this entry is loaded and running
+	int enabled;		// index to array of modlist_enabled
+
+	// name of the modification, this is (will...be) displayed on the menu entry
+	char name[128];
+	// directory where we will find it
+	char dir[MAX_QPATH];
+} modlist_entry_t;
+
+static int modlist_cursor;
+//static int modlist_viewcount;
+
+#define MODLIST_TOTALSIZE		256
+static int modlist_count = 0;
+static modlist_entry_t modlist[MODLIST_TOTALSIZE];
+
+void ModList_RebuildList(void)
+{
+	int i,j;
+	stringlist_t list;
+
+	stringlistinit(&list);
+	if (fs_basedir[0])
+		listdirectory(&list, fs_basedir);
+	else
+		listdirectory(&list, "./");
+	stringlistsort(&list);
+	modlist_count = 0;
+	modlist_numenabled = fs_numgamedirs;
+	for (i = 0;i < list.numstrings;i++)
+	{
+		if (modlist_count >= MODLIST_TOTALSIZE)	break;
+		// check all dirs to see if they "appear" to be mods
+		// reject any dirs that are part of the base game
+		// (such as "id1" and "hipnotic" when in GAME_HIPNOTIC mode)
+		if (gamedirname1 && !strcasecmp(gamedirname1, list.strings[i])) continue;
+		if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue;
+		if (FS_CheckNastyPath (list.strings[i], true)) continue;
+		if (!FS_CheckGameDir(list.strings[i])) continue;
+
+		strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir));
+		//check currently loaded mods
+		modlist[modlist_count].loaded = false;
+		if (fs_numgamedirs)
+			for (j = 0; j < fs_numgamedirs; j++)
+				if (!strcasecmp(fs_gamedirs[j], modlist[modlist_count].dir))
+				{
+					modlist[modlist_count].loaded = true;
+					modlist[modlist_count].enabled = j;
+					modlist_enabled[j] = modlist_count;
+					break;
+				}
+		modlist_count ++;
+	}
+	stringlistfreecontents(&list);
+}
+
+void ModList_Enable (void)
+{
+	int i;
+	int numgamedirs;
+	char gamedirs[MODLIST_MAXDIRS][MAX_QPATH];
+
+	// copy our mod list into an array for FS_ChangeGameDirs
+	numgamedirs = modlist_numenabled;
+	for (i = 0; i < modlist_numenabled; i++)
+		strlcpy (gamedirs[i], modlist[modlist_enabled[i]].dir,sizeof (gamedirs[i]));
+
+	// this code snippet is from FS_ChangeGameDirs
+	if (fs_numgamedirs == numgamedirs)
+	{
+		for (i = 0;i < numgamedirs;i++)
+			if (strcasecmp(fs_gamedirs[i], gamedirs[i]))
+				break;
+		if (i == numgamedirs)
+			return; // already using this set of gamedirs, do nothing
+	}
+
+	// this part is basically the same as the FS_GameDir_f function
+	if ((cls.state == ca_connected && !cls.demoplayback) || sv.active)
+	{
+		// actually, changing during game would work fine, but would be stupid
+		Con_Printf("Can not change gamedir while client is connected or server is running!\n");
+		return;
+	}
+
+	FS_ChangeGameDirs (modlist_numenabled, gamedirs, true, true);
+}
+
+void M_Menu_ModList_f (void)
+{
+	key_dest = key_menu;
+	m_state = m_modlist;
+	m_entersound = true;
+	modlist_cursor = 0;
+	M_Update_Return_Reason("");
+	ModList_RebuildList();
+}
+
+static void M_Menu_ModList_AdjustSliders (int dir)
+{
+	int i;
+	S_LocalSound ("sound/misc/menu3.wav");
+
+	// stop adding mods, we reach the limit
+	if (!modlist[modlist_cursor].loaded && (modlist_numenabled == MODLIST_MAXDIRS)) return;
+	modlist[modlist_cursor].loaded = !modlist[modlist_cursor].loaded;
+	if (modlist[modlist_cursor].loaded)
+	{
+		modlist[modlist_cursor].enabled = modlist_numenabled;
+		//push the value on the enabled list
+		modlist_enabled[modlist_numenabled++] = modlist_cursor;
+	}
+	else
+	{
+		//eliminate the value from the enabled list
+		for (i = modlist[modlist_cursor].enabled; i < modlist_numenabled; i++)
+		{
+			modlist_enabled[i] = modlist_enabled[i+1];
+			modlist[modlist_enabled[i]].enabled--;
+		}
+		modlist_numenabled--;
+	}
+}
+
+static void M_ModList_Draw (void)
+{
+	int n, y, visible, start, end;
+	cachepic_t *p;
+	const char *s_available = "Available Mods";
+	const char *s_enabled = "Enabled Mods";
+
+	// use as much vertical space as available
+	if (gamemode == GAME_TRANSFUSION)
+		M_Background(640, vid_conheight.integer - 80);
+	else
+		M_Background(640, vid_conheight.integer);
+
+	M_PrintRed(48 + 32, 32, s_available);
+	M_PrintRed(432, 32, s_enabled);
+	// Draw a list box with all enabled mods
+	DrawQ_Pic(menu_x + 432, menu_y + 48, NULL, 172, 8 * modlist_numenabled, 0, 0, 0, 0.5, 0);
+	for (y = 0; y < modlist_numenabled; y++)
+		M_PrintRed(432, 48 + y * 8, modlist[modlist_enabled[y]].dir);
+
+	if (*m_return_reason)
+		M_Print(16, menu_height - 8, m_return_reason);
+	// scroll the list as the cursor moves
+	y = 48;
+	visible = (int)((menu_height - 16 - y) / 8 / 2);
+	start = bound(0, modlist_cursor - (visible >> 1), modlist_count - visible);
+	end = min(start + visible, modlist_count);
+
+	p = Draw_CachePic("gfx/p_option", true);
+	M_DrawPic((640 - p->width) / 2, 4, "gfx/p_option");
+	if (end > start)
+	{
+		for (n = start;n < end;n++)
+		{
+			DrawQ_Pic(menu_x + 40, menu_y + y, NULL, 360, 8, n == modlist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+			M_ItemPrint(80, y, modlist[n].dir, true);
+			M_DrawCheckbox(48, y, modlist[n].loaded);
+			y +=8;
+		}
+	}
+	else
+	{
+		M_Print(80, y, "No Mods found");
+	}
+}
+
+static void M_ModList_Key(int k, char ascii)
+{
+	switch (k)
+	{
+	case K_ESCAPE:
+		ModList_Enable ();
+		M_Menu_Options_f();
+		break;
+
+	case K_SPACE:
+		S_LocalSound ("sound/misc/menu2.wav");
+		ModList_RebuildList();
+		break;
+
+	case K_UPARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		modlist_cursor--;
+		if (modlist_cursor < 0)
+			modlist_cursor = modlist_count - 1;
+		break;
+
+	case K_LEFTARROW:
+		M_Menu_ModList_AdjustSliders (-1);
+		break;
+
+	case K_DOWNARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		modlist_cursor++;
+		if (modlist_cursor >= modlist_count)
+			modlist_cursor = 0;
+		break;
+
+	case K_RIGHTARROW:
+		M_Menu_ModList_AdjustSliders (1);
+		break;
+
+	case K_ENTER:
+		S_LocalSound ("sound/misc/menu2.wav");
+		ModList_Enable ();
+		break;
+
+	default:
+		break;
+	}
+
+}
+
 //=============================================================================
 /* Menu Subsystem */
 
@@ -4491,6 +4673,7 @@ void M_Init (void)
 	Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "open the key binding menu");
 	Cmd_AddCommand ("menu_video", M_Menu_Video_f, "open the video options menu");
 	Cmd_AddCommand ("menu_reset", M_Menu_Reset_f, "open the reset to defaults menu");
+	Cmd_AddCommand ("menu_mods", M_Menu_ModList_f, "open the mods browser menu");
 	Cmd_AddCommand ("help", M_Menu_Help_f, "open the help menu");
 	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "open the quit menu");
 	Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu");
@@ -4656,6 +4839,10 @@ void M_Draw (void)
 	case m_slist:
 		M_ServerList_Draw ();
 		break;
+
+	case m_modlist:
+		M_ModList_Draw ();
+		break;
 	}
 
 	if (gamemode == GAME_TRANSFUSION && !m_missingdata) {
@@ -4769,7 +4956,6 @@ void M_KeyEvent (int key, char ascii, qboolean downevent)
 		M_Reset_Key (key, ascii);
 		return;
 
-
 	case m_video:
 		M_Video_Key (key, ascii);
 		return;
@@ -4797,7 +4983,12 @@ void M_KeyEvent (int key, char ascii, qboolean downevent)
 	case m_slist:
 		M_ServerList_Key (key, ascii);
 		return;
+
+	case m_modlist:
+		M_ModList_Key (key, ascii);
+		return;
 	}
+
 }
 
 void M_Shutdown(void)
@@ -4812,22 +5003,13 @@ void M_Restart(void)
 
 //============================================================================
 // Menu prog handling
-mfunction_t *PRVM_ED_FindFunction(const char *);
-
-#define M_F_INIT		"m_init"
-#define M_F_KEYDOWN		"m_keydown"
-#define M_F_KEYUP		"m_keyup"
-#define M_F_DRAW		"m_draw"
-// normal menu names (rest)
-#define M_F_TOGGLE		"m_toggle"
-#define M_F_SHUTDOWN	"m_shutdown"
 
 static char *m_required_func[] = {
-M_F_INIT,
-M_F_KEYDOWN,
-M_F_DRAW,
-M_F_TOGGLE,
-M_F_SHUTDOWN,
+"m_init",
+"m_keydown",
+"m_draw",
+"m_toggle",
+"m_shutdown",
 };
 
 #ifdef NG_MENU
@@ -4836,11 +5018,9 @@ static qboolean m_displayed;
 
 static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
 
-static func_t m_draw, m_keydown;
-static mfunction_t *m_keyup;
-
 void MR_SetRouting (qboolean forceold);
 
+void MP_Error(const char *format, ...) DP_FUNC_PRINTF(1);
 void MP_Error(const char *format, ...)
 {
 	static qboolean processingError = false;
@@ -4878,16 +5058,13 @@ void MP_KeyEvent (int key, char ascii, qboolean downevent)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
 	// pass key
 	prog->globals.generic[OFS_PARM0] = (float) key;
 	prog->globals.generic[OFS_PARM1] = (float) ascii;
 	if (downevent)
-		PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n");
-	else if (m_keyup)
-		PRVM_ExecuteProgram((func_t)(m_keyup - prog->functions), M_F_KEYUP"(float key, float ascii) required\n");
+		PRVM_ExecuteProgram(prog->funcoffsets.m_keydown,"m_keydown(float key, float ascii) required");
+	else if (prog->funcoffsets.m_keyup)
+		PRVM_ExecuteProgram(prog->funcoffsets.m_keyup,"m_keyup(float key, float ascii) required");
 
 	PRVM_End;
 }
@@ -4897,10 +5074,7 @@ void MP_Draw (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
-	PRVM_ExecuteProgram(m_draw,"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_draw,"m_draw() required");
 
 	PRVM_End;
 }
@@ -4910,17 +5084,14 @@ void MP_ToggleMenu_f (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
 #ifdef NG_MENU
 	m_displayed = !m_displayed;
 	if( m_displayed )
-		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_DISPLAY) - prog->functions),"");
+		PRVM_ExecuteProgram(prog->funcoffsets.m_display,"m_display() required");
 	else
-		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_HIDE) - prog->functions),"");
+		PRVM_ExecuteProgram(prog->funcoffsets.m_hide,"m_hide() required");
 #else
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
 #endif
 
 	PRVM_End;
@@ -4931,10 +5102,7 @@ void MP_Shutdown (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_SHUTDOWN) - prog->functions),"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_shutdown,"m_shutdown() required");
 
 	// reset key_dest
 	key_dest = key_game;
@@ -4975,22 +5143,17 @@ void MP_Init (void)
 	// allocate the mempools
 	prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
 
-	PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL);
+	PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL, 0, NULL);
 
-	// set m_draw and m_keydown
-	m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
-	m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
-	m_keyup = PRVM_ED_FindFunction(M_F_KEYUP);
+	// note: OP_STATE is not supported by menu qc, we don't even try to detect
+	// it here
 
 #ifdef NG_MENU
 	m_displayed = false;
 #endif
 
-	// set time
-	*prog->time = realtime;
-
 	// call the prog init
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_init,"m_init() required");
 
 	PRVM_End;
 }
@@ -5003,8 +5166,6 @@ void MP_Restart(void)
 //============================================================================
 // Menu router
 
-static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
-
 void (*MR_KeyEvent) (int key, char ascii, qboolean downevent);
 void (*MR_Draw) (void);
 void (*MR_ToggleMenu_f) (void);
@@ -5068,8 +5229,6 @@ void MR_Init_Commands(void)
 	// set router console commands
 	Cvar_RegisterVariable (&forceqmenu);
 	Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
-	if (gamemode == GAME_NETHERWORLD)
-		Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)"); //Force to old-style menu
 	Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
 	Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
 }