X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=696f753a17b87a6d70414dcfbc6e43c25ca61d28;hb=a3a9fdaf8edba37e4c895b2f10926481c46916a0;hp=3950381f282ccad2b77ba72b1a0ba8eb47c6e594;hpb=f5b1ac271d13d731d68ca7084e84fda3599411ab;p=xonotic%2Fdarkplaces.git

diff --git a/menu.c b/menu.c
index 3950381f..696f753a 100644
--- a/menu.c
+++ b/menu.c
@@ -187,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)
@@ -306,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;
@@ -400,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";
@@ -414,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;
 
@@ -456,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
@@ -477,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)
@@ -629,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)
 			{
@@ -779,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)
@@ -888,7 +829,7 @@ 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);
+		dpsnprintf (name, sizeof(name), "s%i.sav", (int)i);
 		f = FS_Open (name, "rb", false, false);
 		if (!f)
 			continue;
@@ -897,10 +838,10 @@ static void M_ScanSaves (void)
 		buf[sizeof(buf) - 1] = 0;
 		t = buf;
 		// version
-		COM_ParseToken_Simple(&t, false);
+		COM_ParseToken_Simple(&t, false, false);
 		version = atoi(com_token);
 		// description
-		COM_ParseToken_Simple(&t, false);
+		COM_ParseToken_Simple(&t, false, false);
 		strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
 
 	// change _ back to space
@@ -943,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++)
@@ -961,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++)
@@ -1067,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));
@@ -1124,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++)
@@ -1228,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));
@@ -1238,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");
 
@@ -1350,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");
@@ -1378,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)
@@ -1402,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");
@@ -1544,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);
 }
 
@@ -1560,7 +1524,7 @@ static void M_DrawCheckbox (int x, int y, int on)
 
 
 //#define OPTIONS_ITEMS 25 aule was here
-#define OPTIONS_ITEMS 26
+#define OPTIONS_ITEMS 27
 
 
 static int options_cursor;
@@ -1593,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++) ;
@@ -1653,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;
@@ -1669,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);
@@ -1716,37 +1694,37 @@ 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
+		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 22: // Lighting: Normal
+		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 23: // Lighting: High
+		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 24: // Lighting: Full
+		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 25:
+		case 26:
 			M_Menu_ModList_f ();
 			break;
 		default:
@@ -1779,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;
 
@@ -1842,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));
@@ -1858,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;
@@ -1894,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);
@@ -2008,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;
@@ -2196,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 ("gfx/colorcontrol/ditherpattern");
 
 	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;
@@ -2474,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)
@@ -2589,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)
@@ -2654,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);
 		}
 
@@ -2750,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     },
@@ -2805,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     },
@@ -2821,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 10
+#define VIDEO_ITEMS 11
 static int video_cursor = 0;
-static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162, 170, 178, 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)
@@ -2870,53 +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[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[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], "       Texture Quality", true);
+	M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
+	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 Compression", gl_support_texture_compression);
+	M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
+	t++;
 
-	M_ItemPrint(16, video_cursor_table[9], "   Texture Compression", gl_support_texture_compression);
-	M_DrawCheckbox(220, video_cursor_table[9], gl_texturecompression.integer);
+	// "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));
@@ -2925,52 +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;
-		case 9:
-			Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
-			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);
 }
 
 
@@ -2982,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 ();
@@ -2993,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);
@@ -3197,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;
@@ -3285,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("");
 }
@@ -3301,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");
 
@@ -3451,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);
 }
 
 //=============================================================================
@@ -3934,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);
@@ -4360,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;
 
@@ -4370,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);
@@ -4379,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)
 	{
@@ -4481,10 +4469,7 @@ void ModList_RebuildList(void)
 	stringlist_t list;
 
 	stringlistinit(&list);
-	if (fs_basedir[0])
-		listdirectory(&list, fs_basedir);
-	else
-		listdirectory(&list, "./");
+	listdirectory(&list, fs_basedir, "");
 	stringlistsort(&list);
 	modlist_count = 0;
 	modlist_numenabled = fs_numgamedirs;
@@ -4612,7 +4597,7 @@ static void M_ModList_Draw (void)
 	start = bound(0, modlist_cursor - (visible >> 1), modlist_count - visible);
 	end = min(start + visible, modlist_count);
 
-	p = Draw_CachePic("gfx/p_option", true);
+	p = Draw_CachePic ("gfx/p_option");
 	M_DrawPic((640 - p->width) / 2, 4, "gfx/p_option");
 	if (end > start)
 	{
@@ -4771,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)
@@ -4884,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);
@@ -4902,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);
 			}
 		}
 	}
@@ -5042,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);
@@ -5080,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();
 }
 
@@ -5101,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)
@@ -5114,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;
 }
@@ -5143,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;
@@ -5178,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");
@@ -5259,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");
 }