X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=c8ffdb54858d8e486fc836fd5aebc34d02efb937;hb=a334e97bd7b1e7b37fe40a96caf9ccb8504c3f96;hp=a4a3086bb8dcad5556034b11ecd6c3a9b9ddd614;hpb=ac5533c5e5a5ad2e2edfae17c596faf29692aa06;p=xonotic%2Fdarkplaces.git

diff --git a/menu.c b/menu.c
index a4a3086b..c8ffdb54 100644
--- a/menu.c
+++ b/menu.c
@@ -215,7 +215,7 @@ static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
 
 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);
+	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)
@@ -383,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;
 
@@ -425,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
@@ -446,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)
@@ -720,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,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++)
@@ -902,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++)
@@ -1008,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));
@@ -1065,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++)
@@ -1169,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));
@@ -1179,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");
 
@@ -1297,7 +1297,7 @@ static void M_Setup_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_Print(64, 40, "Your name");
@@ -1630,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;
@@ -1837,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;
@@ -1988,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;
@@ -2176,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;
@@ -2569,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)
@@ -2793,9 +2793,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)
@@ -2842,53 +2842,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[9], "   Texture Compression", gl_support_texture_compression);
-	M_DrawCheckbox(220, video_cursor_table[9], gl_texturecompression.integer);
+	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));
@@ -2897,52 +2917,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);
 }
 
 
@@ -2954,8 +2966,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 ();
@@ -2965,7 +2979,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);
@@ -3273,7 +3287,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");
 
@@ -3906,7 +3920,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);
@@ -4352,7 +4366,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)
 	{
@@ -4454,10 +4468,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;
@@ -4585,7 +4596,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)
 	{
@@ -4857,10 +4868,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);
@@ -4875,7 +4886,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);
 			}
 		}
 	}
@@ -5049,6 +5060,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();
 }
 
@@ -5071,12 +5085,10 @@ void MP_KeyEvent (int key, char ascii, qboolean downevent)
 void MP_Draw (void)
 {
 	// declarations that are needed right now
-	extern r_refdef_scene_t menu_scene;
 
 	float oldquality;
-	static r_refdef_scene_t clientscene;
-	clientscene = r_refdef.scene;
-	r_refdef.scene = menu_scene;
+
+	R_SelectScene( RST_MENU );
 
 	// reset the temp entities each frame
 	r_refdef.scene.numtempentities = 0;
@@ -5084,6 +5096,8 @@ void MP_Draw (void)
 	// 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);
@@ -5094,10 +5108,10 @@ void MP_Draw (void)
 
 	PRVM_End;
 
+	// TODO: imo this should be moved into scene, too [1/27/2008 Andreas]
 	r_refdef.view.quality = oldquality;
 
-	menu_scene = r_refdef.scene;
-	r_refdef.scene = clientscene;
+	R_SelectScene( RST_CLIENT );
 }
 
 void MP_ToggleMenu_f (void)