X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=c7c08302a600339da61cbfd7c37e574c2d22907e;hp=c486bcb6fcb600afdcf34cdff8eb767942b48cdd;hb=783c61300adf71a38a5c9edb323d6f5ff90ac51d;hpb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84

diff --git a/menu.c b/menu.c
index c486bcb6..c7c08302 100644
--- a/menu.c
+++ b/menu.c
@@ -18,7 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include "quakedef.h"
+#include "cdaudio.h"
 #include "image.h"
+#include "progsvm.h"
 
 #include "mprogdefs.h"
 
@@ -40,8 +42,10 @@ void M_Menu_Main_f (void);
 		void M_Menu_Setup_f (void);
 	void M_Menu_Options_f (void);
 	void M_Menu_Options_Effects_f (void);
+	void M_Menu_Options_Graphics_f (void);
 	void M_Menu_Options_ColorControl_f (void);
 		void M_Menu_Keys_f (void);
+		void M_Menu_Reset_f (void);
 		void M_Menu_Video_f (void);
 	void M_Menu_Help_f (void);
 	void M_Menu_Quit_f (void);
@@ -57,8 +61,10 @@ void M_Main_Draw (void);
 		void M_Setup_Draw (void);
 	void M_Options_Draw (void);
 	void M_Options_Effects_Draw (void);
+	void M_Options_Graphics_Draw (void);
 	void M_Options_ColorControl_Draw (void);
 		void M_Keys_Draw (void);
+		void M_Reset_Draw (void);
 		void M_Video_Draw (void);
 	void M_Help_Draw (void);
 	void M_Quit_Draw (void);
@@ -74,8 +80,10 @@ void M_Main_Key (int key, char ascii);
 		void M_Setup_Key (int key, char ascii);
 	void M_Options_Key (int key, char ascii);
 	void M_Options_Effects_Key (int key, char ascii);
+	void M_Options_Graphics_Key (int key, char ascii);
 	void M_Options_ColorControl_Key (int key, char ascii);
 		void M_Keys_Key (int key, char ascii);
+		void M_Reset_Key (int key, char ascii);
 		void M_Video_Key (int key, char ascii);
 	void M_Help_Key (int key, char ascii);
 	void M_Quit_Key (int key, char ascii);
@@ -88,6 +96,13 @@ qboolean	m_entersound;		// play after drawing a frame, so caching
 
 char		m_return_reason [32];
 
+void M_Update_Return_Reason(char *s)
+{
+	strlcpy(m_return_reason, s, sizeof(m_return_reason));
+	if (s)
+		Con_Printf("%s\n", s);
+}
+
 #define StartingGame	(m_multiplayer_cursor == 1)
 #define JoiningGame		(m_multiplayer_cursor == 0)
 
@@ -317,7 +332,7 @@ void M_Demo_Key (int k, char ascii)
 		break;
 
 	case K_ENTER:
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		m_state = m_none;
 		key_dest = key_game;
 		Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name));
@@ -325,7 +340,7 @@ void M_Demo_Key (int k, char ascii)
 
 	case K_UPARROW:
 	case K_LEFTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		demo_cursor--;
 		if (demo_cursor < 0)
 			demo_cursor = NumberOfNehahraDemos-1;
@@ -333,7 +348,7 @@ void M_Demo_Key (int k, char ascii)
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		demo_cursor++;
 		if (demo_cursor >= NumberOfNehahraDemos)
 			demo_cursor = 0;
@@ -359,6 +374,8 @@ void M_Menu_Main_f (void)
 		else
 			MAIN_ITEMS = 6;
 	}
+	else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
+		MAIN_ITEMS = 6;
 	else
 		MAIN_ITEMS = 5;
 
@@ -417,13 +434,13 @@ void M_Main_Key (int key, char ascii)
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (++m_main_cursor >= MAIN_ITEMS)
 			m_main_cursor = 0;
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (--m_main_cursor < 0)
 			m_main_cursor = MAIN_ITEMS - 1;
 		break;
@@ -518,6 +535,34 @@ 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
 		{
 			switch (m_main_cursor)
@@ -570,8 +615,8 @@ void M_SinglePlayer_Draw (void)
 	M_DrawPic (16, 4, "gfx/qplaque.lmp");
 	p = Draw_CachePic ("gfx/ttl_sgl.lmp");
 
-	// Transfusion doesn't have a single player mode
-	if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
+	// Some mods don't have a single player mode
+	if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
 	{
 		M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp");
 
@@ -580,10 +625,8 @@ void M_SinglePlayer_Draw (void)
 			M_Print(95, 10 * 8, "Nexuiz is for");
 		else if (gamemode == GAME_GOODVSBAD2)
 			M_Print(95, 10 * 8, "Good Vs Bad 2 is for");
-		else if (gamemode == GAME_BATTLEMECH)
+		else  // if (gamemode == GAME_BATTLEMECH)
 			M_Print(95, 10 * 8, "Battlemech is for");
-		else
-			M_Print(95, 10 * 8, "Transfusion is for");
 		M_Print(83, 11 * 8, "multiplayer play only");
 	}
 	else
@@ -602,7 +645,7 @@ void M_SinglePlayer_Draw (void)
 
 void M_SinglePlayer_Key (int key, char ascii)
 {
-	if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
+	if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
 	{
 		if (key == K_ESCAPE || key == K_ENTER)
 			m_state = m_main;
@@ -616,13 +659,13 @@ void M_SinglePlayer_Key (int key, char ascii)
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (++m_singleplayer_cursor >= SINGLEPLAYER_ITEMS)
 			m_singleplayer_cursor = 0;
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (--m_singleplayer_cursor < 0)
 			m_singleplayer_cursor = SINGLEPLAYER_ITEMS - 1;
 		break;
@@ -641,6 +684,8 @@ void M_SinglePlayer_Key (int key, char ascii)
 			Cbuf_AddText ("coop 0\n");
 			if (gamemode == GAME_NEHAHRA)
 				Cbuf_AddText ("map nehstart\n");
+			else if (gamemode == GAME_TRANSFUSION)
+				Cbuf_AddText ("map e1m1\n");
 			else
 				Cbuf_AddText ("map start\n");
 			break;
@@ -764,7 +809,7 @@ void M_Load_Key (int k, char ascii)
 		break;
 
 	case K_ENTER:
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		if (!loadable[load_cursor])
 			return;
 		m_state = m_none;
@@ -776,7 +821,7 @@ void M_Load_Key (int k, char ascii)
 
 	case K_UPARROW:
 	case K_LEFTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		load_cursor--;
 		if (load_cursor < 0)
 			load_cursor = MAX_SAVEGAMES-1;
@@ -784,7 +829,7 @@ void M_Load_Key (int k, char ascii)
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		load_cursor++;
 		if (load_cursor >= MAX_SAVEGAMES)
 			load_cursor = 0;
@@ -809,7 +854,7 @@ void M_Save_Key (int k, char ascii)
 
 	case K_UPARROW:
 	case K_LEFTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		load_cursor--;
 		if (load_cursor < 0)
 			load_cursor = MAX_SAVEGAMES-1;
@@ -817,7 +862,7 @@ void M_Save_Key (int k, char ascii)
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		load_cursor++;
 		if (load_cursor >= MAX_SAVEGAMES)
 			load_cursor = 0;
@@ -867,13 +912,13 @@ void M_MultiPlayer_Key (int key, char ascii)
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (++m_multiplayer_cursor >= MULTIPLAYER_ITEMS)
 			m_multiplayer_cursor = 0;
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (--m_multiplayer_cursor < 0)
 			m_multiplayer_cursor = MULTIPLAYER_ITEMS - 1;
 		break;
@@ -906,6 +951,7 @@ int		setup_oldbottom;
 int		setup_top;
 int		setup_bottom;
 int		setup_rate;
+int		setup_oldrate;
 
 #define	NUM_SETUP_CMDS	5
 
@@ -1037,14 +1083,14 @@ void M_Setup_Key (int k, char ascii)
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		setup_cursor--;
 		if (setup_cursor < 0)
 			setup_cursor = NUM_SETUP_CMDS-1;
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		setup_cursor++;
 		if (setup_cursor >= NUM_SETUP_CMDS)
 			setup_cursor = 0;
@@ -1053,7 +1099,7 @@ void M_Setup_Key (int k, char ascii)
 	case K_LEFTARROW:
 		if (setup_cursor < 1)
 			return;
-		S_LocalSound ("misc/menu3.wav");
+		S_LocalSound ("sound/misc/menu3.wav");
 		if (setup_cursor == 1)
 			setup_top = setup_top - 1;
 		if (setup_cursor == 2)
@@ -1070,7 +1116,7 @@ void M_Setup_Key (int k, char ascii)
 		if (setup_cursor < 1)
 			return;
 forward:
-		S_LocalSound ("misc/menu3.wav");
+		S_LocalSound ("sound/misc/menu3.wav");
 		if (setup_cursor == 1)
 			setup_top = setup_top + 1;
 		if (setup_cursor == 2)
@@ -1096,6 +1142,9 @@ forward:
 			Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) );
 		if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom)
 			Cbuf_AddText( va ("color %i %i\n", setup_top, setup_bottom) );
+		if (setup_rate != setup_oldrate)
+			Cbuf_AddText(va("rate %i\n", setup_rate));
+
 		m_entersound = true;
 		M_Menu_MultiPlayer_f ();
 		break;
@@ -1164,7 +1213,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 36
+#define OPTIONS_ITEMS 40
 
 int options_cursor;
 
@@ -1175,18 +1224,17 @@ void M_Menu_Options_f (void)
 	m_entersound = true;
 }
 
-extern cvar_t snd_staticvolume;
-extern cvar_t gl_delayfinish;
 extern cvar_t slowmo;
 extern dllhandle_t jpeg_dll;
 extern cvar_t gl_texture_anisotropy;
+extern cvar_t r_textshadow;
 
 void M_Menu_Options_AdjustSliders (int dir)
 {
 	int optnum;
-	S_LocalSound ("misc/menu3.wav");
+	S_LocalSound ("sound/misc/menu3.wav");
 
-	optnum = 6;
+	optnum = 7;
 	if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
 	else if (options_cursor == optnum++)
@@ -1197,8 +1245,14 @@ void M_Menu_Options_AdjustSliders (int dir)
 		Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1));
+	else if (options_cursor == optnum++)
+		Cvar_SetValueQuick (&sbar_alpha_bg, bound(0, sbar_alpha_bg.value + dir * 0.1, 1));
+	else if (options_cursor == optnum++)
+		Cvar_SetValueQuick (&sbar_alpha_fg, bound(0, sbar_alpha_fg.value + dir * 0.1, 1));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
+	else if (options_cursor == optnum++)
+		Cvar_SetValueQuick (&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
 	else if (options_cursor == optnum++)
@@ -1210,21 +1264,17 @@ void M_Menu_Options_AdjustSliders (int dir)
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
 	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value + dir, 8));
+		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
 	else if (options_cursor == optnum++)
-#ifdef _WIN32
-		Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1));
-#else
 		Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
-#endif
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
+	else if (options_cursor == optnum++)
+		Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
 	else if (options_cursor == optnum++)
@@ -1324,24 +1374,28 @@ void M_Options_Draw (void)
 	M_Options_PrintCommand( " Reset to defaults", true);
 	M_Options_PrintCommand( "             Video", true);
 	M_Options_PrintCommand( "           Effects", true);
+	M_Options_PrintCommand( "          Graphics", true);
 	M_Options_PrintCommand( "     Color Control", true);
 	M_Options_PrintSlider(  "  2D Screen Width ", true, vid_conwidth.value, 320, 2048);
 	M_Options_PrintSlider(  "  2D Screen Height", true, vid_conheight.value, 240, 1536);
 	M_Options_PrintSlider(  "     Console Speed", true, scr_conspeed.value, 0, 1000);
 	M_Options_PrintSlider(  "     Console Alpha", true, scr_conalpha.value, 0, 1);
 	M_Options_PrintSlider(  "Conback Brightness", true, scr_conbrightness.value, 0, 1);
+	M_Options_PrintSlider(  "     Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
+	M_Options_PrintSlider(  "     Sbar Alpha FG", true, sbar_alpha_fg.value, 0, 1);
 	M_Options_PrintSlider(  "       Screen size", true, scr_viewsize.value, 30, 120);
+	M_Options_PrintSlider(  "     Field of View", true, scr_fov.integer, 1, 170);
 	M_Options_PrintCheckbox("  JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
 	M_Options_PrintSlider(  "      JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
 	M_Options_PrintCheckbox("               Sky", true, r_sky.integer);
 	M_Options_PrintCheckbox("   Texture Combine", true, gl_combine.integer);
 	M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
-	M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer);
-	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 1, 8);
+	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
 	M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
 	M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
 	M_Options_PrintSlider(  "      Sound Volume", snd_initialized.integer, volume.value, 0, 1);
 	M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? "      Music Volume" : "    Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1);
+	M_Options_PrintCheckbox("       Text Shadow", true, r_textshadow.integer);
 	M_Options_PrintSlider(  "         Crosshair", true, crosshair.value, 0, 5);
 	M_Options_PrintSlider(  "    Crosshair Size", true, crosshair_size.value, 1, 5);
 	M_Options_PrintCheckbox("  Static Crosshair", true, crosshair_static.integer);
@@ -1379,7 +1433,7 @@ void M_Options_Key (int k, char ascii)
 			Con_ToggleConsole_f ();
 			break;
 		case 2:
-			Cbuf_AddText ("exec default.cfg\n");
+			M_Menu_Reset_f ();
 			break;
 		case 3:
 			M_Menu_Video_f ();
@@ -1388,6 +1442,9 @@ void M_Options_Key (int k, char ascii)
 			M_Menu_Options_Effects_f ();
 			break;
 		case 5:
+			M_Menu_Options_Graphics_f ();
+			break;
+		case 6:
 			M_Menu_Options_ColorControl_f ();
 			break;
 		default:
@@ -1397,14 +1454,14 @@ void M_Options_Key (int k, char ascii)
 		return;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		options_cursor--;
 		if (options_cursor < 0)
 			options_cursor = OPTIONS_ITEMS-1;
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		options_cursor++;
 		if (options_cursor >= OPTIONS_ITEMS)
 			options_cursor = 0;
@@ -1420,7 +1477,7 @@ void M_Options_Key (int k, char ascii)
 	}
 }
 
-#define	OPTIONS_EFFECTS_ITEMS	22
+#define	OPTIONS_EFFECTS_ITEMS	37
 
 int options_effects_cursor;
 
@@ -1433,27 +1490,27 @@ void M_Menu_Options_Effects_f (void)
 
 
 extern cvar_t r_detailtextures;
-extern cvar_t cl_particles;
-extern cvar_t cl_explosions;
 extern cvar_t cl_stainmaps;
-extern cvar_t cl_decals;
+extern cvar_t cl_stainmapsclearonload;
 extern cvar_t r_explosionclip;
 extern cvar_t r_modellights;
 extern cvar_t r_coronas;
 extern cvar_t gl_flashblend;
-extern cvar_t cl_particles_quality;
-extern cvar_t cl_particles_bulletimpacts;
-extern cvar_t cl_particles_smoke;
-extern cvar_t cl_particles_sparks;
-extern cvar_t cl_particles_bubbles;
-extern cvar_t cl_particles_blood;
-extern cvar_t cl_particles_blood_alpha;
-extern cvar_t cl_particles_blood_bloodhack;
+extern cvar_t cl_beams_polygon;
+extern cvar_t cl_beams_relative;
+extern cvar_t cl_beams_lightatend;
+extern cvar_t r_lightningbeam_thickness;
+extern cvar_t r_lightningbeam_scroll;
+extern cvar_t r_lightningbeam_repeatdistance;
+extern cvar_t r_lightningbeam_color_red;
+extern cvar_t r_lightningbeam_color_green;
+extern cvar_t r_lightningbeam_color_blue;
+extern cvar_t r_lightningbeam_qmbtexture;
 
 void M_Menu_Options_Effects_AdjustSliders (int dir)
 {
 	int optnum;
-	S_LocalSound ("misc/menu3.wav");
+	S_LocalSound ("sound/misc/menu3.wav");
 
 	optnum = 0;
 	     if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
@@ -1461,9 +1518,10 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
-	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmapsclearonload, !cl_stainmapsclearonload.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
@@ -1473,8 +1531,22 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_polygons, !cl_beams_polygons.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_relative, !cl_beams_relative.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_lightatend, !cl_beams_lightatend.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_thickness, bound(1, r_lightningbeam_thickness.integer + dir, 10));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_scroll, bound(0, r_lightningbeam_scroll.integer + dir, 10));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_repeatdistance, bound(64, r_lightningbeam_repeatdistance.integer + dir * 64, 1024));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_color_red, bound(0, r_lightningbeam_color_red.value + dir * 0.1, 1));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_color_green, bound(0, r_lightningbeam_color_green.value + dir * 0.1, 1));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_color_blue, bound(0, r_lightningbeam_color_blue.value + dir * 0.1, 1));
+	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 (&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));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterwarp, bound(0, r_waterwarp.value + dir * 0.1, 1));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10));
@@ -1501,9 +1573,10 @@ void M_Options_Effects_Draw (void)
 	M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
 	M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
 	M_Options_PrintSlider(  "     Particles Quality", true, cl_particles_quality.value, 1, 4);
-	M_Options_PrintCheckbox("            Explosions", true, cl_explosions.integer);
-	M_Options_PrintCheckbox("    Explosion Clipping", true, r_explosionclip.integer);
+	M_Options_PrintCheckbox("       Explosion Shell", true, cl_particles_explosions_shell.integer);
+	M_Options_PrintCheckbox("  Explosion Shell Clip", true, r_explosionclip.integer);
 	M_Options_PrintCheckbox("             Stainmaps", true, cl_stainmaps.integer);
+	M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmapsclearonload.integer);
 	M_Options_PrintCheckbox("                Decals", true, cl_decals.integer);
 	M_Options_PrintCheckbox("      Detail Texturing", true, r_detailtextures.integer);
 	M_Options_PrintCheckbox("        Bullet Impacts", true, cl_particles_bulletimpacts.integer);
@@ -1513,8 +1586,22 @@ void M_Options_Effects_Draw (void)
 	M_Options_PrintCheckbox("                 Blood", true, cl_particles_blood.integer);
 	M_Options_PrintSlider(  "         Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1);
 	M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer);
+	M_Options_PrintCheckbox("    Lightning Polygons", true, cl_beams_polygons.integer);
+	M_Options_PrintCheckbox("Lightning Smooth Sweep", true, cl_beams_relative.integer);
+	M_Options_PrintCheckbox("   Lightning End Light", true, cl_beams_lightatend.integer);
+	M_Options_PrintSlider(  "   Lightning Thickness", cl_beams_polygons.integer, r_lightningbeam_thickness.integer, 1, 10);
+	M_Options_PrintSlider(  "      Lightning Scroll", cl_beams_polygons.integer, r_lightningbeam_scroll.integer, 0, 10);
+	M_Options_PrintSlider(  " Lightning Repeat Dist", cl_beams_polygons.integer, r_lightningbeam_repeatdistance.integer, 64, 1024);
+	M_Options_PrintSlider(  "   Lightning Color Red", cl_beams_polygons.integer, r_lightningbeam_color_red.value, 0, 1);
+	M_Options_PrintSlider(  " Lightning Color Green", cl_beams_polygons.integer, r_lightningbeam_color_green.value, 0, 1);
+	M_Options_PrintSlider(  "  Lightning Color Blue", cl_beams_polygons.integer, r_lightningbeam_color_blue.value, 0, 1);
+	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_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);
+	M_Options_PrintSlider(  "  Underwater View Warp", true, r_waterwarp.value, 0, 1);
 	M_Options_PrintSlider(  " Water Alpha (opacity)", true, r_wateralpha.value, 0, 1);
 	M_Options_PrintSlider(  "        Water Movement", true, r_waterscroll.value, 0, 10);
 	M_Options_PrintSlider(  " GeForce3 Water Shader", true, r_watershader.value, 0, 10);
@@ -1534,14 +1621,14 @@ void M_Options_Effects_Key (int k, char ascii)
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		options_effects_cursor--;
 		if (options_effects_cursor < 0)
 			options_effects_cursor = OPTIONS_EFFECTS_ITEMS-1;
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		options_effects_cursor++;
 		if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS)
 			options_effects_cursor = 0;
@@ -1558,7 +1645,103 @@ void M_Options_Effects_Key (int k, char ascii)
 }
 
 
+#define	OPTIONS_GRAPHICS_ITEMS	7
+
+int options_graphics_cursor;
+
+void M_Menu_Options_Graphics_f (void)
+{
+	key_dest = key_menu;
+	m_state = m_options_graphics;
+	m_entersound = true;
+}
+
+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;
+
+void M_Menu_Options_Graphics_AdjustSliders (int dir)
+{
+	int optnum;
+	S_LocalSound ("sound/misc/menu3.wav");
+ 
+	optnum = 0;
+
+		 if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss,							bound(0, r_shadow_gloss.integer + dir, 2));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight,				!r_shadow_realtime_dlight.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows,		!r_shadow_realtime_dlight_shadows.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world,					!r_shadow_realtime_world.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows,	!r_shadow_realtime_world_dlightshadows.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps,		bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows,			!r_shadow_realtime_world_shadows.integer);
+}
+
+
+void M_Options_Graphics_Draw (void)
+{
+	int visible;
+	cachepic_t	*p;
 
+	M_Background(320, 200);
+
+	M_DrawPic(16, 4, "gfx/qplaque.lmp");
+	p = Draw_CachePic("gfx/p_option.lmp");
+	M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
+
+	optcursor = options_graphics_cursor;
+	optnum = 0;
+	visible = (vid.conheight - 32) / 8;
+	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
+
+	M_Options_PrintSlider(  "             Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
+	M_Options_PrintCheckbox("             RT DLights", true, r_shadow_realtime_dlight.integer);
+	M_Options_PrintCheckbox("      RT DLight Shadows", true, r_shadow_realtime_dlight_shadows.integer);
+	M_Options_PrintCheckbox("               RT World", true, r_shadow_realtime_world.integer);
+	M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
+	M_Options_PrintSlider(  "     RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
+	M_Options_PrintCheckbox("        RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
+}
+
+
+void M_Options_Graphics_Key (int k, char ascii)
+{
+	switch (k)
+	{
+	case K_ESCAPE:
+		M_Menu_Options_f ();
+		break;
+
+	case K_ENTER:
+		M_Menu_Options_Graphics_AdjustSliders (1);
+		break;
+
+	case K_UPARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		options_graphics_cursor--;
+		if (options_graphics_cursor < 0)
+			options_graphics_cursor = OPTIONS_GRAPHICS_ITEMS-1;
+		break;
+
+	case K_DOWNARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		options_graphics_cursor++;
+		if (options_graphics_cursor >= OPTIONS_GRAPHICS_ITEMS)
+			options_graphics_cursor = 0;
+		break;
+
+	case K_LEFTARROW:
+		M_Menu_Options_Graphics_AdjustSliders (-1);
+		break;
+
+	case K_RIGHTARROW:
+		M_Menu_Options_Graphics_AdjustSliders (1);
+		break;
+	}
+}
 
 
 #define	OPTIONS_COLORCONTROL_ITEMS	18
@@ -1580,7 +1763,7 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir)
 {
 	int optnum;
 	float f;
-	S_LocalSound ("misc/menu3.wav");
+	S_LocalSound ("sound/misc/menu3.wav");
 
 	optnum = 1;
 	if (options_colorcontrol_cursor == optnum++)
@@ -1784,14 +1967,14 @@ void M_Options_ColorControl_Key (int k, char ascii)
 		return;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		options_colorcontrol_cursor--;
 		if (options_colorcontrol_cursor < 0)
 			options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1;
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		options_colorcontrol_cursor++;
 		if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
 			options_colorcontrol_cursor = 0;
@@ -1878,7 +2061,18 @@ char *transfusionbindnames[][2] =
 {"impulse 26",		"next armor type"},
 {"impulse 27",		"identify player"},
 {"impulse 55",		"voting menu"},
-{"impulse 56",		"observer mode"}
+{"impulse 56",		"observer mode"},
+{"",				"Taunts"},            // Taunts
+{"impulse 70",		"taunt 0"},
+{"impulse 71",		"taunt 1"},
+{"impulse 72",		"taunt 2"},
+{"impulse 73",		"taunt 3"},
+{"impulse 74",		"taunt 4"},
+{"impulse 75",		"taunt 5"},
+{"impulse 76",		"taunt 6"},
+{"impulse 77",		"taunt 7"},
+{"impulse 78",		"taunt 8"},
+{"impulse 79",		"taunt 9"}
 };
 
 char *goodvsbad2bindnames[][2] =
@@ -2119,7 +2313,7 @@ void M_Keys_Key (int k, char ascii)
 
 	if (bind_grab)
 	{	// defining a key
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (k == K_ESCAPE)
 		{
 			bind_grab = false;
@@ -2142,7 +2336,7 @@ void M_Keys_Key (int k, char ascii)
 
 	case K_LEFTARROW:
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		do
 		{
 			keys_cursor--;
@@ -2154,7 +2348,7 @@ void M_Keys_Key (int k, char ascii)
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		do
 		{
 			keys_cursor++;
@@ -2166,7 +2360,7 @@ void M_Keys_Key (int k, char ascii)
 
 	case K_ENTER:		// go into bind mode
 		M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		if (keys[NUMKEYS - 1] != -1)
 			M_UnbindCommand (bindnames[keys_cursor][0]);
 		bind_grab = true;
@@ -2174,19 +2368,57 @@ void M_Keys_Key (int k, char ascii)
 
 	case K_BACKSPACE:		// delete bindings
 	case K_DEL:				// delete bindings
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		M_UnbindCommand (bindnames[keys_cursor][0]);
 		break;
 	}
 }
 
+void M_Menu_Reset_f (void)
+{
+	key_dest = key_menu;
+	m_state = m_reset;
+	m_entersound = true;
+}
+
+
+void M_Reset_Key (int key, char ascii)
+{
+	switch (key)
+	{
+	case K_ESCAPE:
+	case 'n':
+	case 'N':
+		m_state = m_options;
+		m_entersound = true;
+		break;
+
+	case 'Y':
+	case 'y':
+		Cbuf_AddText ("exec default.cfg\n");
+		break;
+
+	default:
+		break;
+	}
+}
+
+void M_Reset_Draw (void)
+{
+	int lines = 2, linelength = 20;
+	M_Background(linelength * 8 + 16, lines * 8 + 16);
+	M_DrawTextBox(0, 0, linelength, lines);
+	M_Print(8 + 4 * (linelength - 19),  8, "Really wanna reset?");
+	M_Print(8 + 4 * (linelength - 11), 16, "Press y / n");
+}
+
 //=============================================================================
 /* VIDEO MENU */
 
-#define VIDEO_ITEMS 4
+#define VIDEO_ITEMS 5
 
 int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 80, 100};
+int video_cursor_table[] = {56, 68, 80, 100, 120};
 // note: if modes are added to the beginning of this list, update the
 // video_resolution = x; in M_Menu_Video_f below
 unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}, {0,0}};
@@ -2253,6 +2485,10 @@ void M_Video_Draw (void)
 	// "Apply" button
 	M_Print(220, video_cursor_table[3], "Apply");
 
+	// Vertical Sync
+	M_ItemPrint (0, video_cursor_table[4], "         Vertical Sync", gl_videosyncavailable);
+	M_DrawCheckbox(220, video_cursor_table[4], vid_vsync.integer);
+
 	// Cursor
 	M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
 }
@@ -2260,7 +2496,7 @@ void M_Video_Draw (void)
 
 void M_Menu_Video_AdjustSliders (int dir)
 {
-	S_LocalSound ("misc/menu3.wav");
+	S_LocalSound ("sound/misc/menu3.wav");
 
 	switch (video_cursor)
 	{
@@ -2287,6 +2523,10 @@ void M_Menu_Video_AdjustSliders (int dir)
 		case 2:
 			Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
 			break;
+
+		case 4:
+			Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
+			break;
 	}
 }
 
@@ -2302,7 +2542,7 @@ void M_Video_Key (int key, char ascii)
 			Cvar_SetValueQuick(&vid_height, current_vid_height);
 			Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
 
-			S_LocalSound ("misc/menu1.wav");
+			S_LocalSound ("sound/misc/menu1.wav");
 			M_Menu_Options_f ();
 			break;
 
@@ -2320,14 +2560,14 @@ void M_Video_Key (int key, char ascii)
 			break;
 
 		case K_UPARROW:
-			S_LocalSound ("misc/menu1.wav");
+			S_LocalSound ("sound/misc/menu1.wav");
 			video_cursor--;
 			if (video_cursor < 0)
 				video_cursor = VIDEO_ITEMS-1;
 			break;
 
 		case K_DOWNARROW:
-			S_LocalSound ("misc/menu1.wav");
+			S_LocalSound ("sound/misc/menu1.wav");
 			video_cursor++;
 			if (video_cursor >= VIDEO_ITEMS)
 				video_cursor = 0;
@@ -2454,6 +2694,12 @@ int M_ChooseQuitMessage(int request)
 		if (request-- == 0) return M_QuitMessage("Your mech here is way more impressive","than your car out there...","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL);
 		if (request-- == 0) return M_QuitMessage("Quitting won't reduce your debt","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
 		break;
+	case GAME_OPENQUARTZ:
+		if (request-- == 0) return M_QuitMessage("There is nothing like free beer!","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("GNU is not Unix!","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("You prefer free beer over free speech?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Is OpenQuartz Propaganda?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+		break;
 	default:
 		if (request-- == 0) return M_QuitMessage("Tired of fragging already?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 		if (request-- == 0) return M_QuitMessage("Quit now and forfeit your bodycount?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -2558,7 +2804,7 @@ void M_Menu_LanConfig_f (void)
 	lanConfig_port = 26000;
 	sprintf(lanConfig_portname, "%u", lanConfig_port);
 
-	m_return_reason[0] = 0;
+	M_Update_Return_Reason("");
 }
 
 
@@ -2625,14 +2871,14 @@ void M_LanConfig_Key (int key, char ascii)
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		lanConfig_cursor--;
 		if (lanConfig_cursor < 0)
 			lanConfig_cursor = NUM_LANCONFIG_CMDS-1;
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		lanConfig_cursor++;
 		if (lanConfig_cursor >= NUM_LANCONFIG_CMDS)
 			lanConfig_cursor = 0;
@@ -2908,34 +3154,81 @@ episode_t	nehahraepisodes[] =
 // Map list for Transfusion
 level_t		transfusionlevels[] =
 {
-	{"bb1",			"The Stronghold"},
-	{"bb2",			"Winter Wonderland"},
-	{"bb3",			"Bodies"},
-	{"bb4",			"The Tower"},
-	{"bb5",			"Click!"},
-	{"bb6",			"Twin Fortress"},
-	{"bb7",			"Midgard"},
-	{"bb8",			"Fun With Heads"},
-
 	{"e1m1",		"Cradle to Grave"},
 	{"e1m2",		"Wrong Side of the Tracks"},
+	{"e1m3",		"Phantom Express"},
+	{"e1m4",		"Dark Carnival"},
+	{"e1m5",		"Hallowed Grounds"},
+	{"e1m6",		"The Great Temple"},
 	{"e1m7",		"Altar of Stone"},
+	{"e1m8",		"House of Horrors"},
+
+	{"e2m1",		"Shipwrecked"},
+	{"e2m2",		"The Lumber Mill"},
+	{"e2m3",		"Rest for the Wicked"},
+	{"e2m4",		"The Overlooked Hotel"},
+	{"e2m5",		"The Haunting"},
+	{"e2m6",		"The Cold Rush"},
+	{"e2m7",		"Bowels of the Earth"},
 	{"e2m8",		"The Lair of Shial"},
+	{"e2m9",		"Thin Ice"},
+
+	{"e3m1",		"Ghost Town"},
+	{"e3m2",		"The Siege"},
+	{"e3m3",		"Raw Sewage"},
+	{"e3m4",		"The Sick Ward"},
+	{"e3m5",		"Spare Parts"},
+	{"e3m6",		"Monster Bait"},
 	{"e3m7",		"The Pit of Cerberus"},
+	{"e3m8",		"Catacombs"},
+
 	{"e4m1",		"Butchery Loves Company"},
+	{"e4m2",		"Breeding Grounds"},
+	{"e4m3",		"Charnel House"},
+	{"e4m4",		"Crystal Lake"},
+	{"e4m5",		"Fire and Brimstone"},
+	{"e4m6",		"The Ganglion Depths"},
 	{"e4m7",		"In the Flesh"},
 	{"e4m8",		"The Hall of the Epiphany"},
 	{"e4m9",		"Mall of the Dead"},
 
+	{"bb1",			"The Stronghold"},
+	{"bb2",			"Winter Wonderland"},
+	{"bb3",			"Bodies"},
+	{"bb4",			"The Tower"},
+	{"bb5",			"Click!"},
+	{"bb6",			"Twin Fortress"},
+	{"bb7",			"Midgard"},
+	{"bb8",			"Fun With Heads"},
 	{"dm1",			"Monolith Building 11"},
 	{"dm2",			"Power!"},
 	{"dm3",			"Area 15"},
+
 	{"e6m1",		"Welcome to Your Life"},
+	{"e6m2",		"They Are Here"},
+	{"e6m3",		"Public Storage"},
+	{"e6m4",		"Aqueducts"},
+	{"e6m5",		"The Ruined Temple"},
+	{"e6m6",		"Forbidden Rituals"},
+	{"e6m7",		"The Dungeon"},
 	{"e6m8",		"Beauty and the Beast"},
 	{"e6m9",		"Forgotten Catacombs"},
 
+	{"cp01",		"Boat Docks"},
+	{"cp02",		"Old Opera House"},
+	{"cp03",		"Gothic Library"},
+	{"cp04",		"Lost Monastery"},
+	{"cp05",		"Steamboat"},
+	{"cp06",		"Graveyard"},
+	{"cp07",		"Mountain Pass"},
+	{"cp08",		"Abysmal Mine"},
+	{"cp09",		"Castle"},
+	{"cps1",		"Boggy Creek"},
+
 	{"cpbb01",		"Crypt of Despair"},
+	{"cpbb02",		"Pits of Blood"},
 	{"cpbb03",		"Unholy Cathedral"},
+	{"cpbb04",		"Deadly Inspirations"},
 
 	{"b2a15",		"Area 15 (B2)"},
 	{"barena",		"Blood Arena"},
@@ -2951,6 +3244,7 @@ level_t		transfusionlevels[] =
 	{"qbb1",		"The Confluence"},
 	{"qbb2",		"KathartiK"},
 	{"qbb3",		"Caleb's Woodland Retreat"},
+	{"zoo",			"Zoo"},
 
 	{"dranzbb6",	"Black Coffee"},
 	{"fragm",		"Frag'M"},
@@ -2962,13 +3256,17 @@ level_t		transfusionlevels[] =
 
 episode_t	transfusionepisodes[] =
 {
-	{"Blood", 0, 8},
-	{"Blood Single Player", 8, 9},
-	{"Plasma Pack", 17, 6},
-	{"Cryptic Passage", 23, 2},
-	{"Blood 2", 25, 5},
-	{"Transfusion", 30, 8},
-	{"Conversions", 38, 6}
+	{"The Way of All Flesh", 0, 8},
+	{"Even Death May Die", 8, 9},
+	{"Farewell to Arms", 17, 8},
+	{"Dead Reckoning", 25, 9},
+	{"BloodBath", 34, 11},
+	{"Post Mortem", 45, 9},
+	{"Cryptic Passage", 54, 10},
+	{"Cryptic BloodBath", 64, 4},
+	{"Blood 2", 68, 5},
+	{"Transfusion", 73, 9},
+	{"Conversions", 82, 6}
 };
 
 level_t goodvsbad2levels[] =
@@ -3005,14 +3303,41 @@ episode_t battlemechepisodes[] =
 	{"Time for Battle", 0, 7},
 };
 
+level_t openquartzlevels[] =
+{
+	{"start", "Welcome to Openquartz"},
+
+	{"void1", "The center of nowhere"},                        // 1
+	{"void2", "The place with no name"},
+	{"void3", "The lost supply base"},
+	{"void4", "Past the outer limits"},
+	{"void5", "Into the nonexistance"},
+	{"void6", "Void walk"},
+
+	{"vtest", "Warp Central"},
+	{"box", "The deathmatch box"},
+	{"bunkers", "Void command"},
+	{"house", "House of chaos"},
+	{"office", "Overnight office kill"},
+	{"am1", "The nameless chambers"},
+};
+
+episode_t openquartzepisodes[] =
+{
+	{"Single Player", 0, 1},
+	{"Void Deathmatch", 1, 6},
+	{"Contrib", 7, 6},
+};
+
 gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
 gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
 gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
 gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
 gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7};
+gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
 gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
 gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
+gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
 
 typedef struct
 {
@@ -3031,6 +3356,7 @@ gameinfo_t gamelist[] =
 	{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
 	{GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
 	{GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
+	{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
 	{-1, &sharewarequakegame, &registeredquakegame} // final fallback
 };
 
@@ -3050,8 +3376,6 @@ int maxplayers;
 qboolean m_serverInfoMessage = false;
 double m_serverInfoMessageTime;
 
-extern cvar_t sv_public;
-
 void M_Menu_GameOptions_f (void)
 {
 	key_dest = key_menu;
@@ -3064,8 +3388,8 @@ void M_Menu_GameOptions_f (void)
 }
 
 
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 132, 152, 160};
-#define	NUM_GAMEOPTIONS	11
+int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
+#define	NUM_GAMEOPTIONS	12
 int		gameoptions_cursor;
 
 void M_GameOptions_Draw (void)
@@ -3091,9 +3415,11 @@ void M_GameOptions_Draw (void)
 		M_Print(0, 64, "        Game Type");
 		if (gamemode == GAME_TRANSFUSION)
 		{
-			if (!deathmatch.integer)
+			if (!coop.integer && !deathmatch.integer)
 				Cvar_SetValue("deathmatch", 1);
-			if (deathmatch.integer == 2)
+			if (deathmatch.integer == 0)
+				M_Print(160, 64, "Cooperative");
+			else if (deathmatch.integer == 2)
 				M_Print(160, 64, "Capture the Flag");
 			else
 				M_Print(160, 64, "Blood Bath");
@@ -3173,24 +3499,27 @@ void M_GameOptions_Draw (void)
 	M_Print(0, 104, "    Public server");
 	M_Print(160, 104, (sv_public.integer == 0) ? "no" : "yes");
 
-	M_Print(0, 120, "      Server name");
-	M_DrawTextBox (0, 124, 38, 1);
-	M_Print(8, 132, hostname.string);
+	M_Print(0, 112, "   Server maxrate");
+	M_Print(160, 112, va("%i", sv_maxrate.integer));
+
+	M_Print(0, 128, "      Server name");
+	M_DrawTextBox (0, 132, 38, 1);
+	M_Print(8, 140, hostname.string);
 
 	g = lookupgameinfo();
 
 	if (gamemode != GAME_GOODVSBAD2)
 	{
-		M_Print(0, 152, "         Episode");
-		M_Print(160, 152, g->episodes[startepisode].description);
+		M_Print(0, 160, "         Episode");
+		M_Print(160, 160, g->episodes[startepisode].description);
 	}
 
-	M_Print(0, 160, "           Level");
-	M_Print(160, 160, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
-	M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+	M_Print(0, 168, "           Level");
+	M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
+	M_Print(160, 176, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
 
 // line cursor
-	if (gameoptions_cursor == 8)
+	if (gameoptions_cursor == 9)
 		M_DrawCharacter (8 + 8 * strlen(hostname.string), gameoptions_cursor_table[gameoptions_cursor], 10+((int)(realtime*4)&1));
 	else
 		M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
@@ -3237,10 +3566,26 @@ void M_NetStart_Change (int dir)
 			break;
 		if (gamemode == GAME_TRANSFUSION)
 		{
-			if (deathmatch.integer == 2) // changing from CTF to BloodBath
-				Cvar_SetValueQuick (&deathmatch, 0);
-			else // changing from BloodBath to CTF
-				Cvar_SetValueQuick (&deathmatch, 2);
+			switch (deathmatch.integer)
+			{
+				// From Cooperative to BloodBath
+				case 0:
+					Cvar_SetValueQuick (&coop, 0);
+					Cvar_SetValueQuick (&deathmatch, 1);
+					break;
+
+				// From BloodBath to CTF
+				case 1:
+					Cvar_SetValueQuick (&coop, 0);
+					Cvar_SetValueQuick (&deathmatch, 2);
+					break;
+
+				// From CTF to Cooperative
+				//case 2:
+				default:
+					Cvar_SetValueQuick (&coop, 1);
+					Cvar_SetValueQuick (&deathmatch, 0);
+			}
 		}
 		else if (gamemode == GAME_BATTLEMECH)
 		{
@@ -3314,9 +3659,17 @@ void M_NetStart_Change (int dir)
 		break;
 
 	case 8:
+		Cvar_SetValueQuick (&sv_maxrate, sv_maxrate.integer + dir*500);
+		if (sv_maxrate.integer > NET_MAXRATE)
+			Cvar_SetValueQuick (&sv_maxrate, NET_MAXRATE);
+		if (sv_maxrate.integer < NET_MINRATE)
+			Cvar_SetValueQuick (&sv_maxrate, NET_MINRATE);
 		break;
 
 	case 9:
+		break;
+
+	case 10:
 		if (gamemode == GAME_GOODVSBAD2)
 			break;
 		startepisode += dir;
@@ -3331,7 +3684,7 @@ void M_NetStart_Change (int dir)
 		startlevel = 0;
 		break;
 
-	case 10:
+	case 11:
 		startlevel += dir;
 		g = lookupgameinfo();
 
@@ -3357,14 +3710,14 @@ void M_GameOptions_Key (int key, char ascii)
 		break;
 
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		gameoptions_cursor--;
 		if (gameoptions_cursor < 0)
 			gameoptions_cursor = NUM_GAMEOPTIONS-1;
 		break;
 
 	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		gameoptions_cursor++;
 		if (gameoptions_cursor >= NUM_GAMEOPTIONS)
 			gameoptions_cursor = 0;
@@ -3373,19 +3726,19 @@ void M_GameOptions_Key (int key, char ascii)
 	case K_LEFTARROW:
 		if (gameoptions_cursor == 0)
 			break;
-		S_LocalSound ("misc/menu3.wav");
+		S_LocalSound ("sound/misc/menu3.wav");
 		M_NetStart_Change (-1);
 		break;
 
 	case K_RIGHTARROW:
 		if (gameoptions_cursor == 0)
 			break;
-		S_LocalSound ("misc/menu3.wav");
+		S_LocalSound ("sound/misc/menu3.wav");
 		M_NetStart_Change (1);
 		break;
 
 	case K_ENTER:
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		if (gameoptions_cursor == 0)
 		{
 			if (sv.active)
@@ -3401,7 +3754,7 @@ void M_GameOptions_Key (int key, char ascii)
 		break;
 
 	case K_BACKSPACE:
-		if (gameoptions_cursor == 8)
+		if (gameoptions_cursor == 9)
 		{
 			l = strlen(hostname.string);
 			if (l)
@@ -3417,7 +3770,7 @@ void M_GameOptions_Key (int key, char ascii)
 	default:
 		if (ascii < 32 || ascii > 126)
 			break;
-		if (gameoptions_cursor == 8)
+		if (gameoptions_cursor == 9)
 		{
 			l = strlen(hostname.string);
 			if (l < 37)
@@ -3442,7 +3795,7 @@ void M_Menu_ServerList_f (void)
 	m_state = m_slist;
 	m_entersound = true;
 	slist_cursor = 0;
-	m_return_reason[0] = 0;
+	M_Update_Return_Reason("");
 	Net_Slist_f();
 }
 
@@ -3500,7 +3853,7 @@ void M_ServerList_Key(int k, char ascii)
 
 	case K_UPARROW:
 	case K_LEFTARROW:
-		S_LocalSound("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		slist_cursor--;
 		if (slist_cursor < 0)
 			slist_cursor = hostCacheCount - 1;
@@ -3508,14 +3861,14 @@ void M_ServerList_Key(int k, char ascii)
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		slist_cursor++;
 		if (slist_cursor >= hostCacheCount)
 			slist_cursor = 0;
 		break;
 
 	case K_ENTER:
-		S_LocalSound("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname));
 		break;
 
@@ -3535,7 +3888,7 @@ void M_Shutdown(void);
 
 void M_Init (void)
 {
-	menu_mempool = Mem_AllocPool("Menu");
+	menu_mempool = Mem_AllocPool("Menu", 0, NULL);
 	menuplyr_load = true;
 	menuplyr_pixels = NULL;
 
@@ -3547,10 +3900,12 @@ void M_Init (void)
 	Cmd_AddCommand ("menu_setup", M_Menu_Setup_f);
 	Cmd_AddCommand ("menu_options", M_Menu_Options_f);
 	Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
+	Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f);
 	Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
 	Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
 	Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
 	Cmd_AddCommand ("menu_video", M_Menu_Video_f);
+	Cmd_AddCommand ("menu_reset", M_Menu_Reset_f);
 	Cmd_AddCommand ("help", M_Menu_Help_f);
 	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
 
@@ -3662,6 +4017,10 @@ void M_Draw (void)
 		M_Options_Effects_Draw ();
 		break;
 
+	case m_options_graphics:
+		M_Options_Graphics_Draw ();
+		break;
+
 	case m_options_colorcontrol:
 		M_Options_ColorControl_Draw ();
 		break;
@@ -3670,6 +4029,10 @@ void M_Draw (void)
 		M_Keys_Draw ();
 		break;
 
+	case m_reset:
+		M_Reset_Draw ();
+		break;
+
 	case m_video:
 		M_Video_Draw ();
 		break;
@@ -3697,7 +4060,7 @@ void M_Draw (void)
 
 	if (m_entersound)
 	{
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		m_entersound = false;
 	}
 
@@ -3748,6 +4111,10 @@ void M_Keydown (int key, char ascii)
 		M_Options_Effects_Key (key, ascii);
 		return;
 
+	case m_options_graphics:
+		M_Options_Graphics_Key (key, ascii);
+		return;
+
 	case m_options_colorcontrol:
 		M_Options_ColorControl_Key (key, ascii);
 		return;
@@ -3756,6 +4123,11 @@ void M_Keydown (int key, char ascii)
 		M_Keys_Key (key, ascii);
 		return;
 
+	case m_reset:
+		M_Reset_Key (key, ascii);
+		return;
+
+
 	case m_video:
 		M_Video_Key (key, ascii);
 		return;
@@ -3799,6 +4171,7 @@ mfunction_t *PRVM_ED_FindFunction(const char *);
 #define M_F_INIT		"m_init"
 #define M_F_KEYDOWN		"m_keydown"
 #define M_F_DRAW		"m_draw"
+// normal menu names (rest)
 #define M_F_TOGGLE		"m_toggle"
 #define M_F_SHUTDOWN	"m_shutdown"
 
@@ -3810,9 +4183,13 @@ M_F_TOGGLE,
 M_F_SHUTDOWN,
 };
 
+#ifdef NG_MENU
+qboolean m_displayed;
+#endif
+
 static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
 
-static func_t m_draw,m_keydown;
+static func_t m_draw, m_keydown;
 
 void MR_SetRouting (qboolean forceold);
 
@@ -3868,7 +4245,15 @@ void MP_ToggleMenu_f (void)
 	// set time
 	*prog->time = realtime;
 
+#ifdef NG_MENU
+	m_displayed = !m_displayed;
+	if( m_displayed )
+		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_DISPLAY) - prog->functions),"");
+	else
+		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_HIDE) - prog->functions),"");
+#else
 	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
+#endif
 
 	PRVM_End;
 }
@@ -3909,9 +4294,9 @@ void MP_Init (void)
 	prog->error_cmd = MP_Error;
 
 	// allocate the mempools
-	prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool");
-	prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool");
-	prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME);
+	prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool", 0, NULL);
+	prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool", 0, NULL);
+	prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
 
 	PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
 
@@ -3919,6 +4304,10 @@ void MP_Init (void)
 	m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
 	m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
 
+#ifdef NG_MENU
+	m_displayed = false;
+#endif
+
 	// set time
 	*prog->time = realtime;
 
@@ -3930,7 +4319,6 @@ void MP_Init (void)
 
 void MP_Restart(void)
 {
-
 	MP_Init();
 }
 
@@ -3991,24 +4379,27 @@ void Call_MR_ToggleMenu_f(void)
 		MR_ToggleMenu_f();
 }
 
-void MR_Init()
+void MR_Init_Commands(void)
 {
 	// set router console commands
 	Cvar_RegisterVariable (&forceqmenu);
+	if (gamemode == GAME_NETHERWORLD)
+		Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu
 	Cmd_AddCommand ("menu_restart",MR_Restart);
 	Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);
+}
 
+void MR_Init(void)
+{
 	// use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
+// COMMANDLINEOPTION: Client: -forceqmenu disables menu.dat (same as +forceqmenu 1)
 	if(COM_CheckParm("-forceqmenu"))
 		Cvar_SetValueQuick(&forceqmenu,1);
 	// use -useqmenu for debugging proposes, cause it starts
 	// the normal quake menu only the first time
-	else if(COM_CheckParm("-useqmenu"))
+// COMMANDLINEOPTION: Client: -useqmenu causes the first time you open the menu to use the quake menu, then reverts to menu.dat (if forceqmenu is 0)
+	if(COM_CheckParm("-useqmenu"))
 		MR_SetRouting (TRUE);
-	else
+	else 
 		MR_SetRouting (FALSE);
 }
-
-
-
-