X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=804e42c1818c01d1ea3a6bc1ef67f7d41141570f;hp=86e9a1703b52b55b2e7dd9591a1f6d1a0de5c0d8;hb=14ad2aff100ae111396089eba85c0a02225a09b5;hpb=7f9c228cb46439f0fa31af7b1fe6a66ca827dbd3

diff --git a/menu.c b/menu.c
index 86e9a170..804e42c1 100644
--- a/menu.c
+++ b/menu.c
@@ -56,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);
@@ -78,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);
@@ -100,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
 
@@ -183,64 +187,35 @@ 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, NULL, true);
+	DrawQ_String_Font(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 }
 
 static void M_PrintColored(float cx, float cy, const char *str)
 {
-	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false);
+	DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
 }
 
 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, NULL, true);
+	DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 }
 
 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, NULL, true);
+	DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
 }
 
 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, NULL, true);
+		DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 	else
-		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true);
+		DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
 }
 
 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];
+	DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic (picname), 0, 0, 1, 1, 1, 1, 0);
 }
 
 static void M_DrawTextBox(float x, float y, float width, float height)
@@ -302,7 +277,7 @@ void M_ToggleMenu_f (void)
 {
 	m_entersound = true;
 
-	if (key_dest != key_menu || m_state != m_main)
+	if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
 	{
 		if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1"))
 			return;
@@ -396,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";
@@ -410,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 = !forceqmenu.integer && Draw_CachePic (s, true)->tex == r_texture_notexture;
+	m_missingdata = !forceqmenu.integer && Draw_CachePic (s)->tex == r_texture_notexture;
 	if (m_missingdata)
 		MAIN_ITEMS = 2;
 
@@ -452,7 +425,7 @@ static void M_Main_Draw (void)
 	if (gamemode == GAME_TRANSFUSION) {
 		int y1, y2, y3;
 		M_Background(640, 480);
-		p = Draw_CachePic ("gfx/menu/tb-transfusion", true);
+		p = Draw_CachePic ("gfx/menu/tb-transfusion");
 		M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-transfusion");
 		y2 = 120;
 		// 8 rather than MAIN_ITEMS to skip a number and not miss the last option
@@ -473,7 +446,7 @@ static void M_Main_Draw (void)
 
 	M_Background(320, 200);
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/ttl_main", true);
+	p = Draw_CachePic ("gfx/ttl_main");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
 // Nehahra
 	if (gamemode == GAME_NEHAHRA)
@@ -625,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)
 			{
@@ -775,7 +720,7 @@ static void M_SinglePlayer_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/ttl_sgl", true);
+	p = Draw_CachePic ("gfx/ttl_sgl");
 
 	// Some mods don't have a single player mode
 	if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
@@ -884,8 +829,8 @@ static void M_ScanSaves (void)
 	{
 		strlcpy (m_filenames[i], "--- UNUSED SLOT ---", sizeof(m_filenames[i]));
 		loadable[i] = false;
-		sprintf (name, "s%i.sav", (int)i);
-		f = FS_Open (name, "rb", false, false);
+		dpsnprintf (name, sizeof(name), "s%i.sav", (int)i);
+		f = FS_OpenRealFile (name, "rb", false);
 		if (!f)
 			continue;
 		// read enough to get the comment
@@ -893,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
@@ -939,7 +884,7 @@ static void M_Load_Draw (void)
 
 	M_Background(320, 200);
 
-	p = Draw_CachePic ("gfx/p_load", true);
+	p = Draw_CachePic ("gfx/p_load");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
 
 	for (i=0 ; i< MAX_SAVEGAMES; i++)
@@ -957,7 +902,7 @@ static void M_Save_Draw (void)
 
 	M_Background(320, 200);
 
-	p = Draw_CachePic ("gfx/p_save", true);
+	p = Draw_CachePic ("gfx/p_save");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
 
 	for (i=0 ; i<MAX_SAVEGAMES ; i++)
@@ -1063,7 +1008,7 @@ static void M_Transfusion_Episode_Draw (void)
 	cachepic_t *p;
 	M_Background(640, 480);
 
-	p = Draw_CachePic ("gfx/menu/tb-episodes", true);
+	p = Draw_CachePic ("gfx/menu/tb-episodes");
 	M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-episodes");
 	for (y = 0; y < EPISODE_ITEMS; y++){
 		M_DrawPic (0, 160 + y * 40, va("gfx/menu/episode%i", y+1));
@@ -1120,7 +1065,7 @@ static void M_Transfusion_Skill_Draw (void)
 	cachepic_t	*p;
 	M_Background(640, 480);
 
-	p = Draw_CachePic ("gfx/menu/tb-difficulty", true);
+	p = Draw_CachePic ("gfx/menu/tb-difficulty");
 	M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty");
 
 	for (y = 0; y < SKILL_ITEMS; y++)
@@ -1224,7 +1169,7 @@ static void M_MultiPlayer_Draw (void)
 	if (gamemode == GAME_TRANSFUSION)
 	{
 		M_Background(640, 480);
-		p = Draw_CachePic ("gfx/menu/tb-online", true);
+		p = Draw_CachePic ("gfx/menu/tb-online");
 		M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/tb-online");
 		for (f = 1; f <= MULTIPLAYER_ITEMS; f++)
 			M_DrawPic (0, 180 + f*40, va("gfx/menu/online%i", f));
@@ -1234,7 +1179,7 @@ static void M_MultiPlayer_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", true);
+	p = Draw_CachePic ("gfx/p_multi");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 	M_DrawPic (72, 32, "gfx/mp_menu");
 
@@ -1346,13 +1291,13 @@ static int setup_rateindex(int rate)
 
 static void M_Setup_Draw (void)
 {
-	int i;
+	int i, j;
 	cachepic_t	*p;
 
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", true);
+	p = Draw_CachePic ("gfx/p_multi");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 
 	M_Print(64, 40, "Your name");
@@ -1374,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)
@@ -1398,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,9 +1508,9 @@ static void M_DrawSlider (int x, int y, float num, float rangemin, float rangema
 	M_DrawCharacter (x+i*8, y, 130);
 	M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
 	if (fabs((int)num - num) < 0.01)
-		sprintf(text, "%i", (int)num);
+		dpsnprintf(text, sizeof(text), "%i", (int)num);
 	else
-		sprintf(text, "%.3f", num);
+		dpsnprintf(text, sizeof(text), "%.3f", num);
 	M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
 }
 
@@ -1555,7 +1523,9 @@ static void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 25
+//#define OPTIONS_ITEMS 25 aule was here
+#define OPTIONS_ITEMS 27
+
 
 static int options_cursor;
 
@@ -1587,6 +1557,19 @@ static void M_Menu_Options_AdjustSliders (int dir)
 	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)
+		{
+			Cvar_SetValueQuick (&cl_forwardspeed, 200);
+			Cvar_SetValueQuick (&cl_backspeed, 200);
+		}
+		else
+		{
+			Cvar_SetValueQuick (&cl_forwardspeed, 400);
+			Cvar_SetValueQuick (&cl_backspeed, 400);
+		}
+	}
 	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++) ;
@@ -1647,7 +1630,7 @@ static void M_Options_Draw (void)
 	M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", true);
+	p = Draw_CachePic ("gfx/p_option");
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optnum = 0;
@@ -1663,6 +1646,7 @@ static void M_Options_Draw (void)
 	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);
@@ -1680,6 +1664,7 @@ static void M_Options_Draw (void)
 	M_Options_PrintCommand( "      Lighting: Normal", true);
 	M_Options_PrintCommand( "      Lighting:   High", true);
 	M_Options_PrintCommand( "      Lighting:   Full", true);
+	M_Options_PrintCommand( "           Browse Mods", true);
 }
 
 
@@ -1709,35 +1694,38 @@ static void M_Options_Key (int k, char ascii)
 		case 3:
 			M_Menu_Video_f ();
 			break;
-		case 10:
+		case 11:
 			M_Menu_Options_ColorControl_f ();
 			break;
-		case 16: // Customize Effects
+		case 17: // Customize Effects
 			M_Menu_Options_Effects_f ();
 			break;
-		case 17: // 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");
+		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;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
 			break;
-		case 18: // 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");
+		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;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
 			break;
-		case 19: // 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");
+		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;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
 			break;
-		case 20:
+		case 21:
 			M_Menu_Options_Graphics_f ();
 			break;
-		case 21: // 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+		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 22: // 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+		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 23: // 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+		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 24: // 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+		case 26:
+			M_Menu_ModList_f ();
 			break;
 		default:
 			M_Menu_Options_AdjustSliders (1);
@@ -1769,7 +1757,7 @@ static void M_Options_Key (int k, char ascii)
 	}
 }
 
-#define	OPTIONS_EFFECTS_ITEMS	34
+#define	OPTIONS_EFFECTS_ITEMS	35
 
 static int options_effects_cursor;
 
@@ -1832,6 +1820,7 @@ static void M_Menu_Options_Effects_AdjustSliders (int dir)
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_qmbtexture, !r_lightningbeam_qmbtexture.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerplightstyles, !r_lerplightstyles.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_polyblend, bound(0, gl_polyblend.value + dir * 0.1, 1));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll1, bound(-8, r_skyscroll1.value + dir * 0.1, 8));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll2, bound(-8, r_skyscroll2.value + dir * 0.1, 8));
@@ -1848,7 +1837,7 @@ static void M_Options_Effects_Draw (void)
 	M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", true);
+	p = Draw_CachePic ("gfx/p_option");
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optcursor = options_effects_cursor;
@@ -1884,6 +1873,7 @@ static void M_Options_Effects_Draw (void)
 	M_Options_PrintCheckbox(" Lightning QMB Texture", cl_beams_polygons.integer, r_lightningbeam_qmbtexture.integer);
 	M_Options_PrintCheckbox("   Model Interpolation", true, r_lerpmodels.integer);
 	M_Options_PrintCheckbox("  Sprite Interpolation", true, r_lerpsprites.integer);
+	M_Options_PrintCheckbox(" Flicker Interpolation", true, r_lerplightstyles.integer);
 	M_Options_PrintSlider(  "            View Blend", true, gl_polyblend.value, 0, 1);
 	M_Options_PrintSlider(  "Upper Sky Scroll Speed", true, r_skyscroll1.value, -8, 8);
 	M_Options_PrintSlider(  "Lower Sky Scroll Speed", true, r_skyscroll2.value, -8, 8);
@@ -1930,7 +1920,7 @@ static void M_Options_Effects_Key (int k, char ascii)
 }
 
 
-#define	OPTIONS_GRAPHICS_ITEMS	21
+#define	OPTIONS_GRAPHICS_ITEMS	20
 
 static int options_graphics_cursor;
 
@@ -1945,7 +1935,6 @@ 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;
@@ -1974,7 +1963,6 @@ static void M_Menu_Options_Graphics_AdjustSliders (int dir)
 	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));
@@ -1984,7 +1972,7 @@ static void M_Menu_Options_Graphics_AdjustSliders (int dir)
 	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_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.5), 8));
+	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));
@@ -2000,7 +1988,7 @@ static void M_Options_Graphics_Draw (void)
 	M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", true);
+	p = Draw_CachePic ("gfx/p_option");
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optcursor = options_graphics_cursor;
@@ -2014,7 +2002,6 @@ static void M_Options_Graphics_Draw (void)
 	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_PrintCheckbox("RTWorld DLight Shadows", !gl_flashblend.integer, 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_PrintSlider(  "      Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
@@ -2189,12 +2176,12 @@ static void M_Options_ColorControl_Draw (void)
 	float x, c, s, t, u, v;
 	cachepic_t	*p, *dither;
 
-	dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", true);
+	dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP);
 
 	M_Background(320, 256);
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", true);
+	p = Draw_CachePic ("gfx/p_option");
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optcursor = options_colorcontrol_cursor;
@@ -2467,8 +2454,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)
@@ -2524,7 +2511,7 @@ static int		bind_grab;
 
 void M_Menu_Keys_f (void)
 {
-	key_dest = key_menu;
+	key_dest = key_menu_grabbed;
 	m_state = m_keys;
 	m_entersound = true;
 }
@@ -2582,7 +2569,7 @@ static void M_Keys_Draw (void)
 
 	M_Background(320, 48 + 8 * numcommands);
 
-	p = Draw_CachePic ("gfx/ttl_cstm", true);
+	p = Draw_CachePic ("gfx/ttl_cstm");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
 
 	if (bind_grab)
@@ -2647,7 +2634,7 @@ static void M_Keys_Key (int k, char ascii)
 		}
 		else //if (k != '`')
 		{
-			sprintf (cmd, "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]);
+			dpsnprintf (cmd, sizeof(cmd), "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]);
 			Cbuf_InsertText (cmd);
 		}
 
@@ -2743,14 +2730,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     },
@@ -2798,6 +2777,7 @@ video_resolution_t video_resolutions[] =
 {"WideScreen 16x9"           ,  683, 384, 683, 384, 1     },
 {"WideScreen 16x9"           ,  960, 540, 640, 360, 1     },
 {"WideScreen 16x9"           , 1280, 720, 640, 360, 1     },
+{"WideScreen 16x9"           , 1360, 768, 680, 384, 1     },
 {"WideScreen 16x9"           , 1366, 768, 683, 384, 1     },
 {"WideScreen 16x9"           , 1920,1080, 640, 360, 1     },
 {"WideScreen 16x9"           , 2560,1440, 640, 360, 1     },
@@ -2814,9 +2794,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 9
+#define VIDEO_ITEMS 11
 static int video_cursor = 0;
-static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162, 174, 186};
+static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168};
 static int video_resolution;
 
 void M_Menu_Video_f (void)
@@ -2863,50 +2843,73 @@ void M_Menu_Video_f (void)
 
 static void M_Video_Draw (void)
 {
+	int t;
 	cachepic_t	*p;
 
 	M_Background(320, 200);
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/vidmodes", true);
+	p = Draw_CachePic ("gfx/vidmodes");
 	M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
 
-	// Current Resolution
-	M_Print(16, video_cursor_table[0], "    Current Resolution");
-	if (vid_supportrefreshrate && vid.fullscreen)
-		M_Print(220, video_cursor_table[0], va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
+	t = 0;
+
+	// Current and Proposed Resolution
+	M_Print(16, video_cursor_table[t] - 12, "    Current Resolution");
+	if (vid_supportrefreshrate && vid.userefreshrate && vid.fullscreen)
+		M_Print(220, video_cursor_table[t] - 12, va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
 	else
-		M_Print(220, video_cursor_table[0], va("%dx%d", vid.width, vid.height));
+		M_Print(220, video_cursor_table[t] - 12, va("%dx%d", vid.width, vid.height));
+	M_Print(16, video_cursor_table[t], "        New Resolution");
+	M_Print(220, video_cursor_table[t], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height));
+	M_Print(96, video_cursor_table[t] + 8, va("Type: %s", video_resolutions[video_resolution].type));
+	t++;
 
-	// Proposed Resolution
-	M_Print(16, video_cursor_table[1], "        New Resolution");
-	M_Print(220, video_cursor_table[1], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height));
-	M_Print(96, video_cursor_table[1] + 8, va("Type: %s", video_resolutions[video_resolution].type));
+	// Bits per pixel
+	M_Print(16, video_cursor_table[t], "        Bits per pixel");
+	M_Print(220, video_cursor_table[t], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+	t++;
 
 	// Bits per pixel
-	M_Print(16, video_cursor_table[2], "        Bits per pixel");
-	M_Print(220, video_cursor_table[2], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+	M_Print(16, video_cursor_table[t], "          Antialiasing");
+	M_DrawSlider(220, video_cursor_table[t], vid_samples.value, 1, 32);
+	t++;
 
 	// Refresh Rate
-	M_ItemPrint(16, video_cursor_table[3], "          Refresh Rate", vid_supportrefreshrate);
-	M_DrawSlider(220, video_cursor_table[3], vid_refreshrate.integer, 60, 150);
+	M_ItemPrint(16, video_cursor_table[t], "      Use Refresh Rate", vid_supportrefreshrate);
+	M_DrawCheckbox(220, video_cursor_table[t], vid_userefreshrate.integer);
+	t++;
 
-	// Fullscreen
-	M_Print(16, video_cursor_table[4], "            Fullscreen");
-	M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer);
+	// Refresh Rate
+	M_ItemPrint(16, video_cursor_table[t], "          Refresh Rate", vid_supportrefreshrate && vid_userefreshrate.integer);
+	M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.integer, 60, 150);
+	t++;
 
-	// "Apply" button
-	M_Print(220, video_cursor_table[5], "Apply");
+	// Fullscreen
+	M_Print(16, video_cursor_table[t], "            Fullscreen");
+	M_DrawCheckbox(220, video_cursor_table[t], vid_fullscreen.integer);
+	t++;
 
 	// Vertical Sync
-	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[t], "         Vertical Sync", gl_videosyncavailable);
+	M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer);
+	t++;
 
-	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[t], "    Anisotropic Filter", gl_support_anisotropy);
+	M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
+	t++;
 
-	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[t], "       Texture Quality", true);
+	M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
+	t++;
+
+	M_ItemPrint(16, video_cursor_table[t], "   Texture Compression", gl_support_texture_compression);
+	M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
+	t++;
+
+	// "Apply" button
+	M_Print(220, video_cursor_table[t], "Apply");
+	t++;
 
 	// Cursor
 	M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
@@ -2915,49 +2918,44 @@ static void M_Video_Draw (void)
 
 static void M_Menu_Video_AdjustSliders (int dir)
 {
+	int t;
+
 	S_LocalSound ("sound/misc/menu3.wav");
 
-	switch (video_cursor)
+	t = 0;
+	if (video_cursor == t++)
 	{
 		// Resolution
-		case 1:
+		int r;
+		for(r = 0;r < VID_RES_COUNT;r++)
 		{
-			int r;
-			for(r = 0;r < VID_RES_COUNT;r++)
-			{
-				video_resolution += dir;
-				if (video_resolution >= VID_RES_COUNT)
-					video_resolution = 0;
-				if (video_resolution < 0)
-					video_resolution = VID_RES_COUNT - 1;
-				if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer)
-					break;
-			}
-			break;
+			video_resolution += dir;
+			if (video_resolution >= VID_RES_COUNT)
+				video_resolution = 0;
+			if (video_resolution < 0)
+				video_resolution = VID_RES_COUNT - 1;
+			if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer)
+				break;
 		}
-
-		// Bits per pixel
-		case 2:
-			Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
-			break;
-		// Refresh Rate
-		case 3:
-			Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir);
-			break;
-		case 4:
-			Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
-			break;
-
-		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;
 	}
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&vid_samples, bound(1, vid_samples.value * (dir > 0 ? 2 : 0.5), 32));
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer);
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&vid_refreshrate, bound(60, vid_refreshrate.integer + dir, 150));
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy));
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
+	else if (video_cursor == t++)
+		Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
 }
 
 
@@ -2969,8 +2967,10 @@ static void M_Video_Key (int key, char ascii)
 			// vid_shared.c has a copy of the current video config. We restore it
 			Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen);
 			Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel);
+			Cvar_SetValueQuick(&vid_samples, vid.samples);
 			if (vid_supportrefreshrate)
 				Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate);
+			Cvar_SetValueQuick(&vid_userefreshrate, vid.userefreshrate);
 
 			S_LocalSound ("sound/misc/menu1.wav");
 			M_Menu_Options_f ();
@@ -2980,7 +2980,7 @@ static void M_Video_Key (int key, char ascii)
 			m_entersound = true;
 			switch (video_cursor)
 			{
-				case 5:
+				case (VIDEO_ITEMS - 1):
 					Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution].width);
 					Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution].height);
 					Cvar_SetValueQuick (&vid_conwidth, video_resolutions[video_resolution].conwidth);
@@ -3184,7 +3184,7 @@ void M_Menu_Quit_f (void)
 	int n;
 	if (m_state == m_quit)
 		return;
-	wasInMenus = (key_dest == key_menu);
+	wasInMenus = (key_dest == key_menu || key_dest == key_menu_grabbed);
 	key_dest = key_menu;
 	m_quit_prevstate = m_state;
 	m_state = m_quit;
@@ -3272,7 +3272,7 @@ void M_Menu_LanConfig_f (void)
 	if (StartingGame)
 		lanConfig_cursor = 1;
 	lanConfig_port = 26000;
-	sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
+	dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
 
 	M_Update_Return_Reason("");
 }
@@ -3288,7 +3288,7 @@ static void M_LanConfig_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", true);
+	p = Draw_CachePic ("gfx/p_multi");
 	basex = (320-p->width)/2;
 	M_DrawPic (basex, 4, "gfx/p_multi");
 
@@ -3438,7 +3438,7 @@ static void M_LanConfig_Key (int key, char ascii)
 	l =  atoi(lanConfig_portname);
 	if (l <= 65535)
 		lanConfig_port = l;
-	sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
+	dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
 }
 
 //=============================================================================
@@ -3921,7 +3921,7 @@ void M_GameOptions_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", true);
+	p = Draw_CachePic ("gfx/p_multi");
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 
 	M_DrawTextBox (152, 32, 10, 1);
@@ -4347,7 +4347,7 @@ void M_Menu_ServerList_f (void)
 
 static void M_ServerList_Draw (void)
 {
-	int n, y, visible, start, end;
+	int n, y, visible, start, end, numplayers, maxplayers;
 	cachepic_t *p;
 	const char *s;
 
@@ -4357,7 +4357,8 @@ static void M_ServerList_Draw (void)
 	else
 		M_Background(640, vid_conheight.integer);
 	// scroll the list as the cursor moves
-	s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount);
+	ServerList_GetPlayerStatistics(&numplayers, &maxplayers);
+	s = va("%i/%i masters %i/%i servers %i/%i players", masterreplycount, masterquerycount, serverreplycount, serverquerycount, numplayers, maxplayers);
 	M_PrintRed((640 - strlen(s) * 8) / 2, 32, s);
 	if (*m_return_reason)
 		M_Print(16, menu_height - 8, m_return_reason);
@@ -4366,7 +4367,7 @@ static void M_ServerList_Draw (void)
 	start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
 	end = min(start + visible, serverlist_viewcount);
 
-	p = Draw_CachePic("gfx/p_multi", true);
+	p = Draw_CachePic ("gfx/p_multi");
 	M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
 	if (end > start)
 	{
@@ -4437,6 +4438,230 @@ 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);
+	listdirectory(&list, fs_basedir, "");
+	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");
+	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 */
 
@@ -4463,6 +4688,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");
@@ -4530,7 +4756,7 @@ void M_Init (void)
 
 void M_Draw (void)
 {
-	if (key_dest != key_menu)
+	if (key_dest != key_menu && key_dest != key_menu_grabbed)
 		m_state = m_none;
 
 	if (m_state == m_none)
@@ -4628,6 +4854,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) {
@@ -4639,10 +4869,10 @@ void M_Draw (void)
 			g = (int)(realtime * 64)%96;
 			scale_y_rate = (float)(g+1) / 96;
 			top_offset = (g+12)/12;
-			p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), true);
-			drop1 = Draw_CachePic("gfx/menu/blooddrop1", true);
-			drop2 = Draw_CachePic("gfx/menu/blooddrop2", true);
-			drop3 = Draw_CachePic("gfx/menu/blooddrop3", true);
+			p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset));
+			drop1 = Draw_CachePic ("gfx/menu/blooddrop1");
+			drop2 = Draw_CachePic ("gfx/menu/blooddrop2");
+			drop3 = Draw_CachePic ("gfx/menu/blooddrop3");
 			for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) {
 				for (scale_y = -scale_y_repeat; scale_y <= vid_conheight.integer; scale_y += scale_y_repeat) {
 					DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
@@ -4657,7 +4887,7 @@ void M_Draw (void)
 					DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0);
 					DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop2, 0, 0, 1, 1, 1, 1, 0);
 				}
-				DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), true), 0, 0, 1, 1, 1, 1, 0);
+				DrawQ_Pic (scale_x, -1, Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset)), 0, 0, 1, 1, 1, 1, 0);
 			}
 		}
 	}
@@ -4741,7 +4971,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;
@@ -4769,7 +4998,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)
@@ -4793,10 +5027,6 @@ static char *m_required_func[] = {
 "m_shutdown",
 };
 
-#ifdef NG_MENU
-static qboolean m_displayed;
-#endif
-
 static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
 
 void MR_SetRouting (qboolean forceold);
@@ -4831,6 +5061,9 @@ void MP_Error(const char *format, ...)
 	// init the normal menu now -> this will also correct the menu router pointers
 	MR_SetRouting (TRUE);
 
+	// reset the active scene, too (to be on the safe side ;))
+   R_SelectScene( RST_CLIENT );
+
 	Host_AbortCurrentFrame();
 }
 
@@ -4852,12 +5085,34 @@ void MP_KeyEvent (int key, char ascii, qboolean downevent)
 
 void MP_Draw (void)
 {
+	// declarations that are needed right now
+
+	float oldquality;
+
+	R_SelectScene( RST_MENU );
+
+	// reset the temp entities each frame
+	r_refdef.scene.numtempentities = 0;
+
+	// menu scenes do not use reduced rendering quality
+	oldquality = r_refdef.view.quality;
+	r_refdef.view.quality = 1;
+	// TODO: this needs to be exposed to R_SetView (or something similar) ASAP [2/5/2008 Andreas]
+	r_refdef.scene.time = realtime;
+
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
+	// FIXME: this really shouldnt error out lest we have a very broken refdef state...?
+	// or does it kill the server too?
 	PRVM_ExecuteProgram(prog->funcoffsets.m_draw,"m_draw() required");
 
 	PRVM_End;
+
+	// TODO: imo this should be moved into scene, too [1/27/2008 Andreas]
+	r_refdef.view.quality = oldquality;
+
+	R_SelectScene( RST_CLIENT );
 }
 
 void MP_ToggleMenu_f (void)
@@ -4865,15 +5120,7 @@ void MP_ToggleMenu_f (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-#ifdef NG_MENU
-	m_displayed = !m_displayed;
-	if( m_displayed )
-		PRVM_ExecuteProgram(prog->funcoffsets.m_display,"m_display() required");
-	else
-		PRVM_ExecuteProgram(prog->funcoffsets.m_hide,"m_hide() required");
-#else
 	PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
-#endif
 
 	PRVM_End;
 }
@@ -4894,16 +5141,6 @@ void MP_Shutdown (void)
 	PRVM_End;
 }
 
-void MP_Fallback (void)
-{
-	MP_Shutdown();
-
-	key_dest = key_game;
-
-	// init the normal menu now -> this will also correct the menu router pointers
-	MR_SetRouting (TRUE);
-}
-
 void MP_Init (void)
 {
 	PRVM_Begin;
@@ -4929,9 +5166,7 @@ void MP_Init (void)
 	// 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
+	in_client_mouse = true;
 
 	// call the prog init
 	PRVM_ExecuteProgram(prog->funcoffsets.m_init,"m_init() required");
@@ -5010,8 +5245,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)");
 	Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
 	Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
 }