X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=9644edba44cd6bfb56fc3c9373f10965c679dfdb;hb=ef67922d463314dd46c32d0d55cc71255e1b7add;hp=f2f10a276659b1ab23a909820204107ce9c915b0;hpb=fd45bd4899b44762391909eaab9208c1f2673a35;p=xonotic%2Fdarkplaces.git

diff --git a/menu.c b/menu.c
index f2f10a27..9644edba 100644
--- a/menu.c
+++ b/menu.c
@@ -18,97 +18,114 @@ 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"
 
 #define TYPE_DEMO 1
 #define TYPE_GAME 2
 #define TYPE_BOTH 3
 
-int NehGameType;
+static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
+
+static int NehGameType;
 
 enum m_state_e m_state;
+char m_return_reason[128];
 
 void M_Menu_Main_f (void);
 	void M_Menu_SinglePlayer_f (void);
+		void M_Menu_Transfusion_Episode_f (void);
+			void M_Menu_Transfusion_Skill_f (void);
 		void M_Menu_Load_f (void);
 		void M_Menu_Save_f (void);
 	void M_Menu_MultiPlayer_f (void);
 		void M_Menu_Setup_f (void);
-		void M_Menu_Net_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_Credits_f (void);
 	void M_Menu_Quit_f (void);
 void M_Menu_LanConfig_f (void);
 void M_Menu_GameOptions_f (void);
-void M_Menu_Search_f (void);
-void M_Menu_InetSearch_f (void);
 void M_Menu_ServerList_f (void);
-
-void M_Main_Draw (void);
-	void M_SinglePlayer_Draw (void);
-		void M_Load_Draw (void);
-		void M_Save_Draw (void);
-	void M_MultiPlayer_Draw (void);
-		void M_Setup_Draw (void);
-		void M_Net_Draw (void);
-	void M_Options_Draw (void);
-	void M_Options_Effects_Draw (void);
-		void M_Keys_Draw (void);
-		void M_Video_Draw (void);
-	void M_Help_Draw (void);
-	void M_Quit_Draw (void);
-void M_LanConfig_Draw (void);
-void M_GameOptions_Draw (void);
-void M_Search_Draw (void);
-void M_InetSearch_Draw (void);
-void M_ServerList_Draw (void);
-
-void M_Main_Key (int key);
-	void M_SinglePlayer_Key (int key);
-		void M_Load_Key (int key);
-		void M_Save_Key (int key);
-	void M_MultiPlayer_Key (int key);
-		void M_Setup_Key (int key);
-		void M_Net_Key (int key);
-	void M_Options_Key (int key);
-	void M_Options_Effects_Key (int key);
-		void M_Keys_Key (int key);
-		void M_Video_Key (int key);
-	void M_Help_Key (int key);
-	void M_Quit_Key (int key);
-void M_LanConfig_Key (int key);
-void M_GameOptions_Key (int key);
-void M_Search_Key (int key);
-void M_InetSearch_Key (int key);
-void M_ServerList_Key (int key);
-
-qboolean	m_entersound;		// play after drawing a frame, so caching
-								// won't disrupt the sound
-
-int			m_return_state;
-qboolean	m_return_onerror;
-char		m_return_reason [32];
+void M_Menu_ModList_f (void);
+
+static void M_Main_Draw (void);
+	static void M_SinglePlayer_Draw (void);
+		static void M_Transfusion_Episode_Draw (void);
+			static void M_Transfusion_Skill_Draw (void);
+		static void M_Load_Draw (void);
+		static void M_Save_Draw (void);
+	static void M_MultiPlayer_Draw (void);
+		static void M_Setup_Draw (void);
+	static void M_Options_Draw (void);
+	static void M_Options_Effects_Draw (void);
+	static void M_Options_Graphics_Draw (void);
+	static void M_Options_ColorControl_Draw (void);
+		static void M_Keys_Draw (void);
+		static void M_Reset_Draw (void);
+		static void M_Video_Draw (void);
+	static void M_Help_Draw (void);
+	static void M_Credits_Draw (void);
+	static void M_Quit_Draw (void);
+static void M_LanConfig_Draw (void);
+static void M_GameOptions_Draw (void);
+static void M_ServerList_Draw (void);
+static void M_ModList_Draw (void);
+
+
+static void M_Main_Key (int key, int ascii);
+	static void M_SinglePlayer_Key (int key, int ascii);
+		static void M_Transfusion_Episode_Key (int key, int ascii);
+			static void M_Transfusion_Skill_Key (int key, int ascii);
+		static void M_Load_Key (int key, int ascii);
+		static void M_Save_Key (int key, int ascii);
+	static void M_MultiPlayer_Key (int key, int ascii);
+		static void M_Setup_Key (int key, int ascii);
+	static void M_Options_Key (int key, int ascii);
+	static void M_Options_Effects_Key (int key, int ascii);
+	static void M_Options_Graphics_Key (int key, int ascii);
+	static void M_Options_ColorControl_Key (int key, int ascii);
+		static void M_Keys_Key (int key, int ascii);
+		static void M_Reset_Key (int key, int ascii);
+		static void M_Video_Key (int key, int ascii);
+	static void M_Help_Key (int key, int ascii);
+	static void M_Credits_Key (int key, int ascii);
+	static void M_Quit_Key (int key, int ascii);
+static void M_LanConfig_Key (int key, int ascii);
+static void M_GameOptions_Key (int key, int ascii);
+static void M_ServerList_Key (int key, int ascii);
+static void M_ModList_Key (int key, int ascii);
+
+static qboolean	m_entersound;		///< play after drawing a frame, so caching won't disrupt the sound
+
+void M_Update_Return_Reason(const char *s)
+{
+	strlcpy(m_return_reason, s, sizeof(m_return_reason));
+	if (s)
+		Con_DPrintf("%s\n", s);
+}
 
 #define StartingGame	(m_multiplayer_cursor == 1)
 #define JoiningGame		(m_multiplayer_cursor == 0)
-#define	IPXConfig		(m_net_cursor == 0)
-#define	TCPIPConfig		(m_net_cursor == 1)
-
-void M_ConfigureNetSubsystem(void);
 
 // Nehahra
 #define NumberOfNehahraDemos 34
-typedef struct
+typedef struct nehahrademonames_s
 {
-	char *name;
-	char *desc;
+	const char *name;
+	const char *desc;
 } nehahrademonames_t;
 
-nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
+static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
 {
 	{"intro", "Prologue"},
 	{"genf", "The Beginning"},
@@ -146,15 +163,16 @@ nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
 	{"seal", "The Seal is Broken"}
 };
 
-float menu_x, menu_y, menu_width, menu_height;
+static float menu_x, menu_y, menu_width, menu_height;
 
-void M_DrawBackground(void)
+static void M_Background(int width, int height)
 {
-	menu_width = 320;
-	menu_height = 200;
-	menu_x = (vid.conwidth - menu_width) * 0.5;
-	menu_y = (vid.conheight - menu_height) * 0.5;
-	DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0);
+	menu_width = bound(1.0f, (float)width, vid_conwidth.value);
+	menu_height = bound(1.0f, (float)height, vid_conheight.value);
+	menu_x = (vid_conwidth.integer - menu_width) * 0.5;
+	menu_y = (vid_conheight.integer - menu_height) * 0.5;
+	//DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+	DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
 }
 
 /*
@@ -164,68 +182,43 @@ M_DrawCharacter
 Draws one solid graphics character
 ================
 */
-void M_DrawCharacter (float cx, float cy, int num)
+static void M_DrawCharacter (float cx, float cy, int num)
 {
 	char temp[2];
 	temp[0] = num;
 	temp[1] = 0;
-	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
+	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 }
 
-void M_Print (float cx, float cy, const char *str)
+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);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
 }
 
-void M_PrintWhite (float cx, float cy, const char *str)
+static void M_Print(float cx, float cy, const char *str)
 {
-	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 }
 
-void M_ItemPrint (float cx, float cy, char *str, int unghosted)
+static void M_PrintRed(float cx, float cy, const char *str)
 {
-	if (unghosted)
-		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
-	else
-		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
 }
 
-void M_DrawPic (float cx, float cy, char *picname)
+static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
 {
-	DrawQ_Pic (menu_x + cx, menu_y + cy, picname, 0, 0, 1, 1, 1, 1, 0);
+	if (unghosted)
+		DrawQ_String(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, FONT_MENU);
 }
 
-qbyte identityTable[256];
-qbyte translationTable[256];
-
-void M_BuildTranslationTable(int top, int bottom)
+static void M_DrawPic(float cx, float cy, const char *picname)
 {
-	int j;
-	qbyte *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);
 }
 
-
-void M_DrawTextBox (float x, float y, float width, float height)
+static void M_DrawTextBox(float x, float y, float width, float height)
 {
 	int n;
 	float cx, cy;
@@ -233,42 +226,42 @@ void M_DrawTextBox (float x, float y, float width, float height)
 	// draw left side
 	cx = x;
 	cy = y;
-	M_DrawPic (cx, cy, "gfx/box_tl.lmp");
+	M_DrawPic (cx, cy, "gfx/box_tl");
 	for (n = 0; n < height; n++)
 	{
 		cy += 8;
-		M_DrawPic (cx, cy, "gfx/box_ml.lmp");
+		M_DrawPic (cx, cy, "gfx/box_ml");
 	}
-	M_DrawPic (cx, cy+8, "gfx/box_bl.lmp");
+	M_DrawPic (cx, cy+8, "gfx/box_bl");
 
 	// draw middle
 	cx += 8;
 	while (width > 0)
 	{
 		cy = y;
-		M_DrawPic (cx, cy, "gfx/box_tm.lmp");
+		M_DrawPic (cx, cy, "gfx/box_tm");
 		for (n = 0; n < height; n++)
 		{
 			cy += 8;
 			if (n >= 1)
-				M_DrawPic (cx, cy, "gfx/box_mm2.lmp");
+				M_DrawPic (cx, cy, "gfx/box_mm2");
 			else
-				M_DrawPic (cx, cy, "gfx/box_mm.lmp");
+				M_DrawPic (cx, cy, "gfx/box_mm");
 		}
-		M_DrawPic (cx, cy+8, "gfx/box_bm.lmp");
+		M_DrawPic (cx, cy+8, "gfx/box_bm");
 		width -= 2;
 		cx += 16;
 	}
 
 	// draw right side
 	cy = y;
-	M_DrawPic (cx, cy, "gfx/box_tr.lmp");
+	M_DrawPic (cx, cy, "gfx/box_tr");
 	for (n = 0; n < height; n++)
 	{
 		cy += 8;
-		M_DrawPic (cx, cy, "gfx/box_mr.lmp");
+		M_DrawPic (cx, cy, "gfx/box_mr");
 	}
-	M_DrawPic (cx, cy+8, "gfx/box_br.lmp");
+	M_DrawPic (cx, cy+8, "gfx/box_br");
 }
 
 //=============================================================================
@@ -277,38 +270,38 @@ void M_DrawTextBox (float x, float y, float width, float height)
 
 /*
 ================
-M_ToggleMenu_f
+M_ToggleMenu
 ================
 */
-void M_ToggleMenu_f (void)
+void M_ToggleMenu(int mode)
 {
 	m_entersound = true;
 
-	if (key_dest == key_menu)
+	if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
 	{
-		if (m_state != m_main)
-		{
-			M_Menu_Main_f ();
-			return;
-		}
+		if(mode == 0)
+			return; // the menu is off, and we want it off
+		M_Menu_Main_f ();
+	}
+	else
+	{
+		if(mode == 1)
+			return; // the menu is on, and we want it on
 		key_dest = key_game;
 		m_state = m_none;
-		return;
 	}
-	//if (key_dest == key_console)
-	//	Con_ToggleConsole_f ();
-	//else
-		M_Menu_Main_f ();
 }
 
 
-int demo_cursor;
-void M_Demo_Draw (void)
+static int demo_cursor;
+static void M_Demo_Draw (void)
 {
-	int		i;
+	int i;
+
+	M_Background(320, 200);
 
-	for (i=0; i < NumberOfNehahraDemos; i++)
-		M_Print (16, 16 + 8*i, NehahraDemos[i].desc);
+	for (i = 0;i < NumberOfNehahraDemos;i++)
+		M_Print(16, 16 + 8*i, NehahraDemos[i].desc);
 
 	// line cursor
 	M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(realtime*4)&1));
@@ -317,12 +310,13 @@ void M_Demo_Draw (void)
 
 void M_Menu_Demos_f (void)
 {
-    key_dest = key_menu;
-    m_state = m_demo;
-    m_entersound = true;
+	key_dest = key_menu;
+	m_state = m_demo;
+	m_entersound = true;
 }
 
-void M_Demo_Key (int k)
+
+static void M_Demo_Key (int k, int ascii)
 {
 	switch (k)
 	{
@@ -331,7 +325,7 @@ void M_Demo_Key (int k)
 		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));
@@ -339,17 +333,17 @@ void M_Demo_Key (int k)
 
 	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;
+			demo_cursor = NumberOfNehahraDemos-1;
 		break;
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		demo_cursor++;
-		if (demo_cursor > NumberOfNehahraDemos)
+		if (demo_cursor >= NumberOfNehahraDemos)
 			demo_cursor = 0;
 		break;
 	}
@@ -358,14 +352,45 @@ void M_Demo_Key (int k)
 //=============================================================================
 /* MAIN MENU */
 
-int	m_main_cursor;
+static int	m_main_cursor;
+static qboolean m_missingdata = false;
+
+static int MAIN_ITEMS = 4; // Nehahra: Menu Disable
 
-int MAIN_ITEMS = 4; // Nehahra: Menu Disable
 
 void M_Menu_Main_f (void)
 {
+	const char *s;
+	s = "gfx/mainmenu";
+
 	if (gamemode == GAME_NEHAHRA)
 	{
+		if (FS_FileExists("maps/neh1m4.bsp"))
+		{
+			if (FS_FileExists("hearing.dem"))
+			{
+				Con_DPrint("Main menu: Nehahra movie and game detected.\n");
+				NehGameType = TYPE_BOTH;
+			}
+			else
+			{
+				Con_DPrint("Nehahra game detected.\n");
+				NehGameType = TYPE_GAME;
+			}
+		}
+		else
+		{
+			if (FS_FileExists("hearing.dem"))
+			{
+				Con_DPrint("Nehahra movie detected.\n");
+				NehGameType = TYPE_DEMO;
+			}
+			else
+			{
+				Con_DPrint("Nehahra not found.\n");
+				NehGameType = TYPE_GAME; // could just complain, but...
+			}
+		}
 		if (NehGameType == TYPE_DEMO)
 			MAIN_ITEMS = 4;
 		else if (NehGameType == TYPE_GAME)
@@ -373,9 +398,22 @@ void M_Menu_Main_f (void)
 		else
 			MAIN_ITEMS = 6;
 	}
+	else if (gamemode == GAME_TRANSFUSION)
+	{
+		s = "gfx/menu/mainmenu1";
+		if (sv.active && !cl.intermission && cl.islocalgame)
+			MAIN_ITEMS = 8;
+		else
+			MAIN_ITEMS = 7;
+	}
 	else
 		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)->tex == r_texture_notexture;
+	if (m_missingdata)
+		MAIN_ITEMS = 2;
+
 	/*
 	if (key_dest != key_menu)
 	{
@@ -389,34 +427,74 @@ void M_Menu_Main_f (void)
 }
 
 
-void M_Main_Draw (void)
+static void M_Main_Draw (void)
 {
 	int		f;
 	cachepic_t	*p;
 
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/ttl_main.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp");
+	if (m_missingdata)
+	{
+		float y;
+		const char *s;
+		M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that.
+		y = 480/3-16;
+		s = "You have reached this menu due to missing or unlocatable content/data";M_PrintRed ((640-strlen(s)*8)*0.5, (480/3)-16, s);y+=8;
+		y+=8;
+		s = "You may consider adding";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8;
+		s = "-basedir /path/to/game";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8;
+		s = "to your launch commandline";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8;
+		M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures)
+		M_Print (640/2 - 48, 480/2 + 8, "Quit");
+		M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(realtime*4)&1));
+		return;
+	}
+
+	if (gamemode == GAME_TRANSFUSION) {
+		int y1, y2, y3;
+		M_Background(640, 480);
+		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
+		for (y1 = 1; y1 <= 8; y1++)
+		{
+			if (MAIN_ITEMS == 7 && y1 == 4)
+				y1++;
+			M_DrawPic (0, y2, va("gfx/menu/mainmenu%i", y1));
+			y2 += 40;
+		}
+		if (MAIN_ITEMS == 7 && m_main_cursor > 2)
+			y3 = m_main_cursor + 2;
+		else
+			y3 = m_main_cursor + 1;
+		M_DrawPic (0, 120 + m_main_cursor * 40, va("gfx/menu/mainmenu%iselected", y3));
+		return;
+	}
+
+	M_Background(320, 200);
+	M_DrawPic (16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/ttl_main");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
 // Nehahra
 	if (gamemode == GAME_NEHAHRA)
 	{
 		if (NehGameType == TYPE_BOTH)
-			M_DrawPic (72, 32, "gfx/mainmenu.lmp");
+			M_DrawPic (72, 32, "gfx/mainmenu");
 		else if (NehGameType == TYPE_GAME)
-			M_DrawPic (72, 32, "gfx/gamemenu.lmp");
+			M_DrawPic (72, 32, "gfx/gamemenu");
 		else
-			M_DrawPic (72, 32, "gfx/demomenu.lmp");
+			M_DrawPic (72, 32, "gfx/demomenu");
 	}
 	else
-		M_DrawPic (72, 32, "gfx/mainmenu.lmp");
+		M_DrawPic (72, 32, "gfx/mainmenu");
 
 	f = (int)(realtime * 10)%6;
 
-	M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+	M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i", f+1));
 }
 
 
-void M_Main_Key (int key)
+static void M_Main_Key (int key, int ascii)
 {
 	switch (key)
 	{
@@ -429,13 +507,13 @@ void M_Main_Key (int key)
 		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;
@@ -443,7 +521,24 @@ void M_Main_Key (int key)
 	case K_ENTER:
 		m_entersound = true;
 
-		if (gamemode == GAME_NEHAHRA)
+		if (m_missingdata)
+		{
+			switch (m_main_cursor)
+			{
+			case 0:
+				if (cls.state == ca_connected)
+				{
+					m_state = m_none;
+					key_dest = key_game;
+				}
+				Con_ToggleConsole_f ();
+				break;
+			case 1:
+				M_Menu_Quit_f ();
+				break;
+			}
+		}
+		else if (gamemode == GAME_NEHAHRA)
 		{
 			switch (NehGameType)
 			{
@@ -530,6 +625,78 @@ void M_Main_Key (int key)
 				break;
 			}
 		}
+		else if (gamemode == GAME_TRANSFUSION) {
+			if (MAIN_ITEMS == 7)
+			{
+				switch (m_main_cursor)
+				{
+				case 0:
+					M_Menu_Transfusion_Episode_f ();
+					break;
+
+				case 1:
+					M_Menu_MultiPlayer_f ();
+					break;
+
+				case 2:
+					M_Menu_Options_f ();
+					break;
+
+				case 3:
+					M_Menu_Load_f ();
+					break;
+
+				case 4:
+					M_Menu_Help_f ();
+					break;
+
+				case 5:
+					M_Menu_Credits_f ();
+					break;
+
+				case 6:
+					M_Menu_Quit_f ();
+					break;
+				}
+			}
+			else
+			{
+				switch (m_main_cursor)
+				{
+				case 0:
+					M_Menu_Transfusion_Episode_f ();
+					break;
+
+				case 1:
+					M_Menu_MultiPlayer_f ();
+					break;
+
+				case 2:
+					M_Menu_Options_f ();
+					break;
+
+				case 3:
+					M_Menu_Save_f ();
+					break;
+
+				case 4:
+					M_Menu_Load_f ();
+					break;
+
+				case 5:
+					M_Menu_Help_f ();
+					break;
+
+				case 6:
+					M_Menu_Credits_f ();
+					break;
+
+				case 7:
+					M_Menu_Quit_f ();
+					break;
+				}
+			}
+		}
 		else
 		{
 			switch (m_main_cursor)
@@ -561,7 +728,7 @@ void M_Main_Key (int key)
 //=============================================================================
 /* SINGLE PLAYER MENU */
 
-int	m_singleplayer_cursor;
+static int	m_singleplayer_cursor;
 #define	SINGLEPLAYER_ITEMS	3
 
 
@@ -573,39 +740,44 @@ void M_Menu_SinglePlayer_f (void)
 }
 
 
-void M_SinglePlayer_Draw (void)
+static void M_SinglePlayer_Draw (void)
 {
 	cachepic_t	*p;
 
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/ttl_sgl.lmp");
+	M_Background(320, 200);
 
-	// Transfusion doesn't have a single player mode
-	if (gamemode == GAME_TRANSFUSION)
+	M_DrawPic (16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/ttl_sgl");
+
+	// Some mods don't have a single player mode
+	if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
 	{
-		M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp");
+		M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl");
 
 		M_DrawTextBox (60, 8 * 8, 23, 4);
-		M_PrintWhite (95, 10 * 8, "Transfusion is for");
-		M_PrintWhite (83, 11 * 8, "multiplayer play only");
+		if (gamemode == GAME_GOODVSBAD2)
+			M_Print(95, 10 * 8, "Good Vs Bad 2 is for");
+		else  // if (gamemode == GAME_BATTLEMECH)
+			M_Print(95, 10 * 8, "Battlemech is for");
+		M_Print(83, 11 * 8, "multiplayer play only");
 	}
 	else
 	{
 		int		f;
 
-		M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp");
-		M_DrawPic (72, 32, "gfx/sp_menu.lmp");
+		M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl");
+		M_DrawPic (72, 32, "gfx/sp_menu");
 
 		f = (int)(realtime * 10)%6;
 
-		M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+		M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i", f+1));
 	}
 }
 
 
-void M_SinglePlayer_Key (int key)
+static void M_SinglePlayer_Key (int key, int ascii)
 {
-	if (gamemode == GAME_TRANSFUSION)
+	if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
 	{
 		if (key == K_ESCAPE || key == K_ENTER)
 			m_state = m_main;
@@ -619,13 +791,13 @@ void M_SinglePlayer_Key (int key)
 		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;
@@ -642,10 +814,13 @@ void M_SinglePlayer_Key (int key)
 			Cbuf_AddText ("maxplayers 1\n");
 			Cbuf_AddText ("deathmatch 0\n");
 			Cbuf_AddText ("coop 0\n");
-			if (gamemode == GAME_NEHAHRA)
-				Cbuf_AddText ("map nehstart\n");
-			else
-				Cbuf_AddText ("map start\n");
+			if (gamemode == GAME_TRANSFUSION)
+			{
+				key_dest = key_menu;
+				M_Menu_Transfusion_Episode_f ();
+				break;
+			}
+			Cbuf_AddText ("startmap_sp\n");
 			break;
 
 		case 1:
@@ -662,39 +837,47 @@ void M_SinglePlayer_Key (int key)
 //=============================================================================
 /* LOAD/SAVE MENU */
 
-int		load_cursor;		// 0 < load_cursor < MAX_SAVEGAMES
+static int		load_cursor;		///< 0 < load_cursor < MAX_SAVEGAMES
 
-#define	MAX_SAVEGAMES		12
-char	m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
-int		loadable[MAX_SAVEGAMES];
+static char	m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
+static int		loadable[MAX_SAVEGAMES];
 
-void M_ScanSaves (void)
+static void M_ScanSaves (void)
 {
 	int		i, j;
+	size_t	len;
 	char	name[MAX_OSPATH];
-	char	*str;
-	QFile	*f;
-	int		version;
+	char	buf[SAVEGAME_COMMENT_LENGTH + 256];
+	const char *t;
+	qfile_t	*f;
+//	int		version;
 
 	for (i=0 ; i<MAX_SAVEGAMES ; i++)
 	{
-		strcpy (m_filenames[i], "--- UNUSED SLOT ---");
+		strlcpy (m_filenames[i], "--- UNUSED SLOT ---", sizeof(m_filenames[i]));
 		loadable[i] = false;
-		sprintf (name, "%s/s%i.sav", com_gamedir, i);
-		f = Qopen (name, "rz");
+		dpsnprintf (name, sizeof(name), "s%i.sav", (int)i);
+		f = FS_OpenRealFile (name, "rb", false);
 		if (!f)
 			continue;
-		str = Qgetline (f);
-		sscanf (str, "%i\n", &version);
-		str = Qgetline (f);
-		strncpy (m_filenames[i], str, sizeof(m_filenames[i])-1);
+		// read enough to get the comment
+		len = FS_Read(f, buf, sizeof(buf) - 1);
+		len = min(len, sizeof(buf)-1);
+		buf[len] = 0;
+		t = buf;
+		// version
+		COM_ParseToken_Simple(&t, false, false);
+		//version = atoi(com_token);
+		// description
+		COM_ParseToken_Simple(&t, false, false);
+		strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
 
 	// change _ back to space
 		for (j=0 ; j<SAVEGAME_COMMENT_LENGTH ; j++)
 			if (m_filenames[i][j] == '_')
 				m_filenames[i][j] = ' ';
 		loadable[i] = true;
-		Qclose (f);
+		FS_Close (f);
 	}
 }
 
@@ -711,10 +894,16 @@ void M_Menu_Save_f (void)
 {
 	if (!sv.active)
 		return;
+#if 1
+	// LordHavoc: allow saving multiplayer games
+	if (cl.islocalgame && cl.intermission)
+		return;
+#else
 	if (cl.intermission)
 		return;
-	if (svs.maxclients != 1)
+	if (!cl.islocalgame)
 		return;
+#endif
 	m_entersound = true;
 	m_state = m_save;
 	key_dest = key_menu;
@@ -722,48 +911,55 @@ void M_Menu_Save_f (void)
 }
 
 
-void M_Load_Draw (void)
+static void M_Load_Draw (void)
 {
 	int		i;
 	cachepic_t	*p;
 
-	p = Draw_CachePic ("gfx/p_load.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp");
+	M_Background(320, 200);
+
+	p = Draw_CachePic ("gfx/p_load");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
 
 	for (i=0 ; i< MAX_SAVEGAMES; i++)
-		M_Print (16, 32 + 8*i, m_filenames[i]);
+		M_Print(16, 32 + 8*i, m_filenames[i]);
 
 // line cursor
 	M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(realtime*4)&1));
 }
 
 
-void M_Save_Draw (void)
+static void M_Save_Draw (void)
 {
 	int		i;
 	cachepic_t	*p;
 
-	p = Draw_CachePic ("gfx/p_save.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp");
+	M_Background(320, 200);
+
+	p = Draw_CachePic ("gfx/p_save");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
 
 	for (i=0 ; i<MAX_SAVEGAMES ; i++)
-		M_Print (16, 32 + 8*i, m_filenames[i]);
+		M_Print(16, 32 + 8*i, m_filenames[i]);
 
 // line cursor
 	M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(realtime*4)&1));
 }
 
 
-void M_Load_Key (int k)
+static void M_Load_Key (int k, int ascii)
 {
 	switch (k)
 	{
 	case K_ESCAPE:
-		M_Menu_SinglePlayer_f ();
+		if (gamemode == GAME_TRANSFUSION)
+			M_Menu_Main_f ();
+		else
+			M_Menu_SinglePlayer_f ();
 		break;
 
 	case K_ENTER:
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		if (!loadable[load_cursor])
 			return;
 		m_state = m_none;
@@ -775,7 +971,7 @@ void M_Load_Key (int k)
 
 	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;
@@ -783,7 +979,7 @@ void M_Load_Key (int k)
 
 	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;
@@ -792,12 +988,15 @@ void M_Load_Key (int k)
 }
 
 
-void M_Save_Key (int k)
+static void M_Save_Key (int k, int ascii)
 {
 	switch (k)
 	{
 	case K_ESCAPE:
-		M_Menu_SinglePlayer_f ();
+		if (gamemode == GAME_TRANSFUSION)
+			M_Menu_Main_f ();
+		else
+			M_Menu_SinglePlayer_f ();
 		break;
 
 	case K_ENTER:
@@ -808,7 +1007,7 @@ void M_Save_Key (int k)
 
 	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;
@@ -816,7 +1015,7 @@ void M_Save_Key (int k)
 
 	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;
@@ -824,10 +1023,167 @@ void M_Save_Key (int k)
 	}
 }
 
+//=============================================================================
+/* Transfusion Single Player Episode Menu */
+
+static int	m_episode_cursor;
+#define	EPISODE_ITEMS	6
+
+void M_Menu_Transfusion_Episode_f (void)
+{
+	m_entersound = true;
+	m_state = m_transfusion_episode;
+	key_dest = key_menu;
+}
+
+static void M_Transfusion_Episode_Draw (void)
+{
+	int y;
+	cachepic_t *p;
+	M_Background(640, 480);
+
+	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));
+	}
+
+	M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1));
+}
+
+static void M_Transfusion_Episode_Key (int key, int ascii)
+{
+	switch (key)
+	{
+	case K_ESCAPE:
+		M_Menu_Main_f ();
+		break;
+
+	case K_DOWNARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		m_episode_cursor++;
+		if (m_episode_cursor >= EPISODE_ITEMS)
+			m_episode_cursor = 0;
+		break;
+
+	case K_UPARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		m_episode_cursor--;
+		if (m_episode_cursor < 0)
+			m_episode_cursor = EPISODE_ITEMS - 1;
+		break;
+
+	case K_ENTER:
+		Cbuf_AddText ("deathmatch 0\n");
+		m_entersound = true;
+		M_Menu_Transfusion_Skill_f ();
+	}
+}
+
+//=============================================================================
+/* Transfusion Single Player Skill Menu */
+
+static int	m_skill_cursor = 2;
+#define	SKILL_ITEMS	5
+
+void M_Menu_Transfusion_Skill_f (void)
+{
+	m_entersound = true;
+	m_state = m_transfusion_skill;
+	key_dest = key_menu;
+}
+
+static void M_Transfusion_Skill_Draw (void)
+{
+	int y;
+	cachepic_t	*p;
+	M_Background(640, 480);
+
+	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++)
+	{
+		M_DrawPic (0, 180 + y * 40, va("gfx/menu/difficulty%i", y+1));
+	}
+	M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1));
+}
+
+static void M_Transfusion_Skill_Key (int key, int ascii)
+{
+	switch (key)
+	{
+	case K_ESCAPE:
+		M_Menu_Transfusion_Episode_f ();
+		break;
+
+	case K_DOWNARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		m_skill_cursor++;
+		if (m_skill_cursor >= SKILL_ITEMS)
+			m_skill_cursor = 0;
+		break;
+
+	case K_UPARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		m_skill_cursor--;
+		if (m_skill_cursor < 0)
+			m_skill_cursor = SKILL_ITEMS - 1;
+		break;
+
+	case K_ENTER:
+		m_entersound = true;
+		switch (m_skill_cursor)
+		{
+		case 0:
+			Cbuf_AddText ("skill 1\n");
+			break;
+		case 1:
+			Cbuf_AddText ("skill 2\n");
+			break;
+		case 2:
+			Cbuf_AddText ("skill 3\n");
+			break;
+		case 3:
+			Cbuf_AddText ("skill 4\n");
+			break;
+		case 4:
+			Cbuf_AddText ("skill 5\n");
+			break;
+		}
+		key_dest = key_game;
+		if (sv.active)
+			Cbuf_AddText ("disconnect\n");
+		Cbuf_AddText ("maxplayers 1\n");
+		Cbuf_AddText ("deathmatch 0\n");
+		Cbuf_AddText ("coop 0\n");
+		switch (m_episode_cursor)
+		{
+		case 0:
+			Cbuf_AddText ("map e1m1\n");
+			break;
+		case 1:
+			Cbuf_AddText ("map e2m1\n");
+			break;
+		case 2:
+			Cbuf_AddText ("map e3m1\n");
+			break;
+		case 3:
+			Cbuf_AddText ("map e4m1\n");
+			break;
+		case 4:
+			Cbuf_AddText ("map e6m1\n");
+			break;
+		case 5:
+			Cbuf_AddText ("map cp01\n");
+			break;
+		}
+	}
+}
 //=============================================================================
 /* MULTIPLAYER MENU */
 
-int	m_multiplayer_cursor;
+static int	m_multiplayer_cursor;
 #define	MULTIPLAYER_ITEMS	3
 
 
@@ -839,27 +1195,35 @@ void M_Menu_MultiPlayer_f (void)
 }
 
 
-void M_MultiPlayer_Draw (void)
+static void M_MultiPlayer_Draw (void)
 {
 	int		f;
 	cachepic_t	*p;
 
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
-	M_DrawPic (72, 32, "gfx/mp_menu.lmp");
+	if (gamemode == GAME_TRANSFUSION)
+	{
+		M_Background(640, 480);
+		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));
+		M_DrawPic (0, 220 + m_multiplayer_cursor * 40, va("gfx/menu/online%iselected", m_multiplayer_cursor + 1));
+		return;
+	}
+	M_Background(320, 200);
+
+	M_DrawPic (16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/p_multi");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
+	M_DrawPic (72, 32, "gfx/mp_menu");
 
 	f = (int)(realtime * 10)%6;
 
-	M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
-
-	if (ipxAvailable || tcpipAvailable)
-		return;
-	M_PrintWhite ((320/2) - ((27*8)/2), 168, "No Communications Available");
+	M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i", f+1));
 }
 
 
-void M_MultiPlayer_Key (int key)
+static void M_MultiPlayer_Key (int key, int ascii)
 {
 	switch (key)
 	{
@@ -868,13 +1232,13 @@ void M_MultiPlayer_Key (int key)
 		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;
@@ -884,13 +1248,8 @@ void M_MultiPlayer_Key (int key)
 		switch (m_multiplayer_cursor)
 		{
 		case 0:
-			if (ipxAvailable || tcpipAvailable)
-				M_Menu_Net_f ();
-			break;
-
 		case 1:
-			if (ipxAvailable || tcpipAvailable)
-				M_Menu_Net_f ();
+			M_Menu_LanConfig_f ();
 			break;
 
 		case 2:
@@ -903,15 +1262,16 @@ void M_MultiPlayer_Key (int key)
 //=============================================================================
 /* SETUP MENU */
 
-int		setup_cursor = 4;
-int		setup_cursor_table[] = {40, 56, 80, 104, 140};
+static int		setup_cursor = 4;
+static int		setup_cursor_table[] = {40, 64, 88, 124, 140};
 
-char	setup_hostname[16];
-char	setup_myname[16];
-int		setup_oldtop;
-int		setup_oldbottom;
-int		setup_top;
-int		setup_bottom;
+static char	setup_myname[MAX_SCOREBOARDNAME];
+static int		setup_oldtop;
+static int		setup_oldbottom;
+static int		setup_top;
+static int		setup_bottom;
+static int		setup_rate;
+static int		setup_oldrate;
 
 #define	NUM_SETUP_CMDS	5
 
@@ -920,100 +1280,143 @@ void M_Menu_Setup_f (void)
 	key_dest = key_menu;
 	m_state = m_setup;
 	m_entersound = true;
-	strcpy(setup_myname, cl_name.string);
-	strcpy(setup_hostname, hostname.string);
+	strlcpy(setup_myname, cl_name.string, sizeof(setup_myname));
 	setup_top = setup_oldtop = cl_color.integer >> 4;
 	setup_bottom = setup_oldbottom = cl_color.integer & 15;
+	setup_rate = cl_rate.integer;
 }
 
-// LordHavoc: rewrote this code greatly
-void M_MenuPlayerTranslate (qbyte *translation, int top, int bottom)
+static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load;
+static unsigned char *menuplyr_pixels;
+static unsigned int *menuplyr_translated;
+
+typedef struct ratetable_s
 {
-	int i;
-	unsigned int trans[4096];
-	qbyte *data, *f;
-	static qbyte pixels[4096];
-	static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load = true, menuplyr_failed = false;
-
-	if (menuplyr_failed)
-		return;
-	if (menuplyr_top == top && menuplyr_bottom == bottom)
-		return;
-
-	menuplyr_top = top;
-	menuplyr_bottom = bottom;
-
-	if (menuplyr_load)
-	{
-		menuplyr_load = false;
-		f = COM_LoadFile("gfx/menuplyr.lmp", true);
-		if (!f)
-		{
-			menuplyr_failed = true;
-			return;
-		}
-		data = LoadLMPAs8Bit (f, 0, 0);
-		Mem_Free(f);
-		if (image_width * image_height > 4096)
-		{
-			Con_Printf("M_MenuPlayerTranslate: image larger than 4096 pixel buffer\n");
-			Mem_Free(data);
-			menuplyr_failed = true;
-			return;
-		}
-		menuplyr_width = image_width;
-		menuplyr_height = image_height;
-		memcpy(pixels, data, menuplyr_width * menuplyr_height);
-		Mem_Free(data);
-	}
-
-	M_BuildTranslationTable (menuplyr_top*16, menuplyr_bottom*16);
+	int rate;
+	const char *name;
+}
+ratetable_t;
 
-	for (i = 0;i < menuplyr_width * menuplyr_height;i++)
-		trans[i] = palette_complete[translation[pixels[i]]];
+#define RATES ((int)(sizeof(setup_ratetable)/sizeof(setup_ratetable[0])))
+static ratetable_t setup_ratetable[] =
+{
+	{1000, "28.8 bad"},
+	{1500, "28.8 mediocre"},
+	{2000, "28.8 good"},
+	{2500, "33.6 mediocre"},
+	{3000, "33.6 good"},
+	{3500, "56k bad"},
+	{4000, "56k mediocre"},
+	{4500, "56k adequate"},
+	{5000, "56k good"},
+	{7000, "64k ISDN"},
+	{15000, "128k ISDN"},
+	{25000, "broadband"}
+};
 
-	Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans);
+static int setup_rateindex(int rate)
+{
+	int i;
+	for (i = 0;i < RATES;i++)
+		if (setup_ratetable[i].rate > setup_rate)
+			break;
+	return bound(1, i, RATES) - 1;
 }
 
-void M_Setup_Draw (void)
+static void M_Setup_Draw (void)
 {
+	int i, j;
 	cachepic_t	*p;
 
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
+	M_Background(320, 200);
 
-	M_Print (64, 40, "Hostname");
+	M_DrawPic (16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/p_multi");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
+
+	M_Print(64, 40, "Your name");
 	M_DrawTextBox (160, 32, 16, 1);
-	M_Print (168, 40, setup_hostname);
+	M_PrintColored(168, 40, setup_myname);
 
-	M_Print (64, 56, "Your name");
-	M_DrawTextBox (160, 48, 16, 1);
-	M_Print (168, 56, setup_myname);
+	if (gamemode != GAME_GOODVSBAD2)
+	{
+		M_Print(64, 64, "Shirt color");
+		M_Print(64, 88, "Pants color");
+	}
 
-	M_Print (64, 80, "Shirt color");
-	M_Print (64, 104, "Pants color");
+	M_Print(64, 124-8, "Network speed limit");
+	M_Print(168, 124, va("%i (%s)", setup_rate, setup_ratetable[setup_rateindex(setup_rate)].name));
 
 	M_DrawTextBox (64, 140-8, 14, 1);
-	M_Print (72, 140, "Accept Changes");
-
-	M_DrawPic (160, 64, "gfx/bigbox.lmp");
+	M_Print(72, 140, "Accept Changes");
 
 	// LordHavoc: rewrote this code greatly
-	M_MenuPlayerTranslate (translationTable, setup_top, setup_bottom);
-	M_DrawPic (172, 72, "gfx/menuplyr.lmp");
+	if (menuplyr_load)
+	{
+		unsigned char *f;
+		fs_offset_t filesize;
+		menuplyr_load = false;
+		menuplyr_top = -1;
+		menuplyr_bottom = -1;
+		f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize);
+		if (f && filesize >= 9)
+		{
+			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);
+	}
 
-	M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1));
+	if (menuplyr_pixels)
+	{
+		if (menuplyr_top != setup_top || menuplyr_bottom != setup_bottom)
+		{
+			menuplyr_top = setup_top;
+			menuplyr_bottom = setup_bottom;
 
-	if (setup_cursor == 0)
-		M_DrawCharacter (168 + 8*strlen(setup_hostname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1));
+			for (i = 0;i < menuplyr_width * menuplyr_height;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");
+		M_DrawPic(172, 56, "gfx/menuplyr");
+	}
 
-	if (setup_cursor == 1)
+	if (setup_cursor == 0)
 		M_DrawCharacter (168 + 8*strlen(setup_myname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1));
+	else
+		M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1));
 }
 
 
-void M_Setup_Key (int k)
+static void M_Setup_Key (int k, int ascii)
 {
 	int			l;
 
@@ -1024,65 +1427,74 @@ void M_Setup_Key (int k)
 		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;
 		break;
 
 	case K_LEFTARROW:
-		if (setup_cursor < 2)
+		if (setup_cursor < 1)
 			return;
-		S_LocalSound ("misc/menu3.wav");
-		if (setup_cursor == 2)
+		S_LocalSound ("sound/misc/menu3.wav");
+		if (setup_cursor == 1)
 			setup_top = setup_top - 1;
-		if (setup_cursor == 3)
+		if (setup_cursor == 2)
 			setup_bottom = setup_bottom - 1;
+		if (setup_cursor == 3)
+		{
+			l = setup_rateindex(setup_rate) - 1;
+			if (l < 0)
+				l = RATES - 1;
+			setup_rate = setup_ratetable[l].rate;
+		}
 		break;
 	case K_RIGHTARROW:
-		if (setup_cursor < 2)
+		if (setup_cursor < 1)
 			return;
 forward:
-		S_LocalSound ("misc/menu3.wav");
-		if (setup_cursor == 2)
+		S_LocalSound ("sound/misc/menu3.wav");
+		if (setup_cursor == 1)
 			setup_top = setup_top + 1;
-		if (setup_cursor == 3)
+		if (setup_cursor == 2)
 			setup_bottom = setup_bottom + 1;
+		if (setup_cursor == 3)
+		{
+			l = setup_rateindex(setup_rate) + 1;
+			if (l >= RATES)
+				l = 0;
+			setup_rate = setup_ratetable[l].rate;
+		}
 		break;
 
 	case K_ENTER:
-		if (setup_cursor == 0 || setup_cursor == 1)
+		if (setup_cursor == 0)
 			return;
 
-		if (setup_cursor == 2 || setup_cursor == 3)
+		if (setup_cursor == 1 || setup_cursor == 2 || setup_cursor == 3)
 			goto forward;
 
-		// setup_cursor == 4 (OK)
+		// setup_cursor == 4 (Accept changes)
 		if (strcmp(cl_name.string, setup_myname) != 0)
 			Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) );
-		if (strcmp(hostname.string, setup_hostname) != 0)
-			Cvar_Set("hostname", setup_hostname);
 		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;
 
 	case K_BACKSPACE:
 		if (setup_cursor == 0)
-		{
-			if (strlen(setup_hostname))
-				setup_hostname[strlen(setup_hostname)-1] = 0;
-		}
-
-		if (setup_cursor == 1)
 		{
 			if (strlen(setup_myname))
 				setup_myname[strlen(setup_myname)-1] = 0;
@@ -1090,24 +1502,15 @@ forward:
 		break;
 
 	default:
-		if (k < 32 || k > 127)
+		if (ascii < 32)
 			break;
 		if (setup_cursor == 0)
 		{
-			l = strlen(setup_hostname);
-			if (l < 15)
-			{
-				setup_hostname[l+1] = 0;
-				setup_hostname[l] = k;
-			}
-		}
-		if (setup_cursor == 1)
-		{
-			l = strlen(setup_myname);
+			l = (int)strlen(setup_myname);
 			if (l < 15)
 			{
 				setup_myname[l+1] = 0;
-				setup_myname[l] = k;
+				setup_myname[l] = ascii;
 			}
 		}
 	}
@@ -1122,158 +1525,43 @@ forward:
 		setup_bottom = 15;
 }
 
-//=============================================================================
-/* NET MENU */
-
-int	m_net_cursor;
-int m_net_items;
-int m_net_saveHeight;
-
-char *net_helpMessage [] =
-{
-/* .........1.........2.... */
-  " Novell network LANs    ",
-  " or Windows 95 DOS-box. ",
-  "                        ",
-  "(LAN=Local Area Network)",
-
-  " Commonly used to play  ",
-  " over the Internet, but ",
-  " also used on a Local   ",
-  " Area Network.          "
-};
-
-void M_Menu_Net_f (void)
-{
-	key_dest = key_menu;
-	m_state = m_net;
-	m_entersound = true;
-	m_net_items = 2;
-
-	if (m_net_cursor >= m_net_items)
-		m_net_cursor = 0;
-	m_net_cursor--;
-	M_Net_Key (K_DOWNARROW);
-}
-
-
-void M_Net_Draw (void)
-{
-	int		f;
-	cachepic_t	*p;
-
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
-
-	f = 32;
-
-	if (ipxAvailable)
-		M_DrawPic (72, f, "gfx/netmen3.lmp");
-	else
-		M_DrawPic (72, f, "gfx/dim_ipx.lmp");
-
-	f += 19;
-	if (tcpipAvailable)
-		M_DrawPic (72, f, "gfx/netmen4.lmp");
-	else
-		M_DrawPic (72, f, "gfx/dim_tcp.lmp");
-
-	if (m_net_items == 5)	// JDC, could just be removed
-	{
-		f += 19;
-		M_DrawPic (72, f, "gfx/netmen5.lmp");
-	}
-
-	f = (320-26*8)/2;
-	M_DrawTextBox (f, 134, 24, 4);
-	f += 8;
-	M_Print (f, 142, net_helpMessage[m_net_cursor*4+0]);
-	M_Print (f, 150, net_helpMessage[m_net_cursor*4+1]);
-
-	f = (int)(realtime * 10)%6;
-	M_DrawPic (54, 32 + m_net_cursor * 20, va("gfx/menudot%i.lmp", f+1));
-}
-
-
-void M_Net_Key (int k)
-{
-again:
-	switch (k)
-	{
-	case K_ESCAPE:
-		M_Menu_MultiPlayer_f ();
-		break;
-
-	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
-		if (++m_net_cursor >= m_net_items)
-			m_net_cursor = 0;
-		break;
-
-	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
-		if (--m_net_cursor < 0)
-			m_net_cursor = m_net_items - 1;
-		break;
-
-	case K_ENTER:
-		m_entersound = true;
-
-		switch (m_net_cursor)
-		{
-		case 0:
-			M_Menu_LanConfig_f ();
-			break;
-
-		case 1:
-			M_Menu_LanConfig_f ();
-			break;
-
-		case 2:
-// multiprotocol
-			break;
-		}
-	}
-
-	if (m_net_cursor == 0 && !ipxAvailable)
-		goto again;
-	if (m_net_cursor == 1 && !tcpipAvailable)
-		goto again;
-}
-
 //=============================================================================
 /* OPTIONS MENU */
 
 #define	SLIDER_RANGE	10
 
-void M_DrawSlider (int x, int y, float range)
+static void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
 {
-	int	i;
-
-	if (range < 0)
-		range = 0;
-	if (range > 1)
-		range = 1;
+	char text[16];
+	int i;
+	float range;
+	range = bound(0, (num - rangemin) / (rangemax - rangemin), 1);
 	M_DrawCharacter (x-8, y, 128);
-	for (i=0 ; i<SLIDER_RANGE ; i++)
+	for (i = 0;i < SLIDER_RANGE;i++)
 		M_DrawCharacter (x + i*8, y, 129);
 	M_DrawCharacter (x+i*8, y, 130);
 	M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
+	if (fabs((int)num - num) < 0.01)
+		dpsnprintf(text, sizeof(text), "%i", (int)num);
+	else
+		dpsnprintf(text, sizeof(text), "%.3f", num);
+	M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
 }
 
-void M_DrawCheckbox (int x, int y, int on)
+static void M_DrawCheckbox (int x, int y, int on)
 {
 	if (on)
-		M_Print (x, y, "on");
+		M_Print(x, y, "on");
 	else
-		M_Print (x, y, "off");
+		M_Print(x, y, "off");
 }
 
 
-#define	OPTIONS_ITEMS	28
+//#define OPTIONS_ITEMS 25 aule was here
+#define OPTIONS_ITEMS 27
 
-int		options_cursor;
+
+static int options_cursor;
 
 void M_Menu_Options_f (void)
 {
@@ -1282,66 +1570,29 @@ void M_Menu_Options_f (void)
 	m_entersound = true;
 }
 
+extern cvar_t slowmo;
+extern dllhandle_t jpeg_dll;
+extern cvar_t gl_texture_anisotropy;
+extern cvar_t r_textshadow;
+extern cvar_t r_hdr_scenebrightness;
 
-void M_Menu_Options_AdjustSliders (int dir)
+static void M_Menu_Options_AdjustSliders (int dir)
 {
-	S_LocalSound ("misc/menu3.wav");
-
-	switch (options_cursor)
+	int optnum;
+	double f;
+	S_LocalSound ("sound/misc/menu3.wav");
+
+	optnum = 0;
+	     if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 7));
+	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++)
 	{
-	case 5:
-		Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
-		break;
-	case 6:
-		Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
-		break;
-	case 7:
-		Cvar_SetValueQuick (&r_sky, !r_sky.integer);
-		break;
-	case 8:
-		Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
-		break;
-	case 9:
-		Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
-		break;
-	case 10:
-		Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
-		break;
-	case 11:
-		Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
-		break;
-	case 12:
-		Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.25, 5));
-		break;
-	case 13:
-		Cvar_SetValueQuick (&v_contrast, bound(0.5, v_contrast.value + dir * 0.25, 5));
-		break;
-	case 14:
-		Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
-		break;
-	case 15: // music volume
-		#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
-		break;
-	case 16: // sfx volume
-		Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
-		break;
-	case 17:
-		Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
-		break;
-	case 18:
-		Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
-		break;
-	case 19: // static crosshair
-		Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
-		break;
-	case 20: // show framerate
-		Cvar_SetValueQuick (&showfps, !showfps.integer);
-		break;
-	case 21: // always run
 		if (cl_forwardspeed.value > 200)
 		{
 			Cvar_SetValueQuick (&cl_forwardspeed, 200);
@@ -1352,73 +1603,106 @@ void M_Menu_Options_AdjustSliders (int dir)
 			Cvar_SetValueQuick (&cl_forwardspeed, 400);
 			Cvar_SetValueQuick (&cl_backspeed, 400);
 		}
-		break;
-	case 22: // lookspring
-		Cvar_SetValueQuick (&lookspring, !lookspring.integer);
-		break;
-	case 23: // lookstrafe
-		Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
-		break;
-	case 24: // mouse speed
-		Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
-		break;
-	case 25: // mouse look
-		Cvar_SetValueQuick (&freelook, !freelook.integer);
-		break;
-	case 26: // invert mouse
-		Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
-		break;
-	case 27: // windowed mouse
-		Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
-		break;
 	}
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer);
+	else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);}
+	else if (options_cursor == optnum++) ;
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&r_hdr_scenebrightness, bound(1, r_hdr_scenebrightness.value + dir * 0.0625, 4));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_contrast, bound(1, v_contrast.value + dir * 0.0625, 4));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_gamma, bound(0.5, v_gamma.value + dir * 0.0625, 3));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&volume, bound(0, volume.value + dir * 0.0625, 1));
+	else if (options_cursor == optnum++) Cvar_SetValueQuick(&bgmvolume, bound(0, bgmvolume.value + dir * 0.0625, 1));
+}
+
+static int optnum;
+static int opty;
+static int optcursor;
+
+static void M_Options_PrintCommand(const char *s, int enabled)
+{
+	if (opty >= 32)
+	{
+		if (optnum == optcursor)
+			DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+		M_ItemPrint(0 + 48, opty, s, enabled);
+	}
+	opty += 8;
+	optnum++;
+}
+
+static void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
+{
+	if (opty >= 32)
+	{
+		if (optnum == optcursor)
+			DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+		M_ItemPrint(0 + 48, opty, s, enabled);
+		M_DrawCheckbox(0 + 48 + (int)strlen(s) * 8 + 8, opty, yes);
+	}
+	opty += 8;
+	optnum++;
+}
+
+static void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
+{
+	if (opty >= 32)
+	{
+		if (optnum == optcursor)
+			DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+		M_ItemPrint(0 + 48, opty, s, enabled);
+		M_DrawSlider(0 + 48 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+	}
+	opty += 8;
+	optnum++;
 }
 
-void M_Options_Draw (void)
+static void M_Options_Draw (void)
 {
-	float y;
+	int visible;
 	cachepic_t	*p;
 
-	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");
-
-	y = 32;
-	M_Print(16, y, "    Customize controls");y += 8;
-	M_Print(16, y, "         Go to console");y += 8;
-	M_Print(16, y, "     Reset to defaults");y += 8;
-	M_Print(16, y, "         Video Options");y += 8;
-	M_Print(16, y, "       Effects Options");y += 8;
-	M_Print(16, y, "         2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value);y += 8;
-	M_Print(16, y, "           Screen size");M_DrawSlider(220, y, (scr_viewsize.value - 30) /(120 - 30));y += 8;
-	M_Print(16, y, "                   Sky");M_DrawCheckbox(220, y, r_sky.integer);y += 8;
-	M_Print(16, y, "       Overbright Bits");M_DrawSlider(220, y, (v_overbrightbits.value) / 4);y += 8;
-	M_Print(16, y, "       Texture Combine");M_DrawCheckbox(220, y, gl_combine.integer);y += 8;
-	M_Print(16, y, "             Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8;
-	M_ItemPrint(16, y, "Hardware Gamma Control", hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
-	M_ItemPrint(16, y, "                 Gamma", v_hwgamma.integer);M_DrawSlider(220, y, (v_gamma.value - 1) / 4);y += 8;
-	M_Print(16, y, "              Contrast");M_DrawSlider(220, y, (v_contrast.value - 0.5) / (5 - 0.5));y += 8;
-	M_Print(16, y, "            Brightness");M_DrawSlider(220, y, v_brightness.value / 0.8);y += 8;
-	M_ItemPrint(16, y, "       CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value);y += 8;
-	M_ItemPrint(16, y, "          Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value);y += 8;
-	M_Print(16, y, "             Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
-	M_Print(16, y, "        Crosshair Size");M_DrawSlider(220, y, (crosshair_size.value - 1) / 4);y += 8;
-	M_Print(16, y, "      Static Crosshair");M_DrawCheckbox(220, y, crosshair_static.integer);y += 8;
-	M_Print(16, y, "        Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
-	M_Print(16, y, "            Always Run");M_DrawCheckbox(220, y, cl_forwardspeed.value > 200);y += 8;
-	M_Print(16, y, "            Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8;
-	M_Print(16, y, "            Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.integer);y += 8;
-	M_Print(16, y, "           Mouse Speed");M_DrawSlider(220, y, (sensitivity.value - 1)/50);y += 8;
-	M_Print(16, y, "            Mouse Look");M_DrawCheckbox(220, y, freelook.integer);y += 8;
-	M_Print(16, y, "          Invert Mouse");M_DrawCheckbox(220, y, m_pitch.value < 0);y += 8;
-	M_Print(16, y, "             Use Mouse");M_DrawCheckbox(220, y, vid_mouse.integer);y += 8;
-
-	// cursor
-	M_DrawCharacter(200, 32 + options_cursor*8, 12+((int)(realtime*4)&1));
-}
-
-
-void M_Options_Key (int k)
+	M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
+
+	M_DrawPic(16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/p_option");
+	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+
+	optnum = 0;
+	optcursor = options_cursor;
+	visible = (int)((menu_height - 32) / 8);
+	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8;
+
+	M_Options_PrintCommand( "    Customize controls", true);
+	M_Options_PrintCommand( "         Go to console", true);
+	M_Options_PrintCommand( "     Reset to defaults", true);
+	M_Options_PrintCommand( "     Change Video Mode", true);
+	M_Options_PrintSlider(  "             Crosshair", true, crosshair.value, 0, 7);
+	M_Options_PrintSlider(  "           Mouse Speed", true, sensitivity.value, 1, 50);
+	M_Options_PrintCheckbox("          Invert Mouse", true, m_pitch.value < 0);
+	M_Options_PrintSlider(  "         Field of View", true, scr_fov.integer, 1, 170);
+	M_Options_PrintCheckbox("            Always Run", true, cl_forwardspeed.value > 200);
+	M_Options_PrintCheckbox("        Show Framerate", true, showfps.integer);
+	M_Options_PrintCheckbox("    Show Date and Time", true, showdate.integer && showtime.integer);
+	M_Options_PrintCommand( "     Custom Brightness", true);
+	M_Options_PrintSlider(  "       Game Brightness", true, r_hdr_scenebrightness.value, 1, 4);
+	M_Options_PrintSlider(  "            Brightness", true, v_contrast.value, 1, 2);
+	M_Options_PrintSlider(  "                 Gamma", true, v_gamma.value, 0.5, 3);
+	M_Options_PrintSlider(  "          Sound Volume", snd_initialized.integer, volume.value, 0, 1);
+	M_Options_PrintSlider(  "          Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
+	M_Options_PrintCommand( "     Customize Effects", true);
+	M_Options_PrintCommand( "       Effects:  Quake", true);
+	M_Options_PrintCommand( "       Effects: Normal", true);
+	M_Options_PrintCommand( "       Effects:   High", true);
+	M_Options_PrintCommand( "    Customize Lighting", true);
+	M_Options_PrintCommand( "      Lighting: Flares", true);
+	M_Options_PrintCommand( "      Lighting: Normal", true);
+	M_Options_PrintCommand( "      Lighting:   High", true);
+	M_Options_PrintCommand( "      Lighting:   Full", true);
+	M_Options_PrintCommand( "           Browse Mods", true);
+}
+
+
+static void M_Options_Key (int k, int ascii)
 {
 	switch (k)
 	{
@@ -1435,17 +1719,48 @@ void M_Options_Key (int k)
 			break;
 		case 1:
 			m_state = m_none;
+			key_dest = key_game;
 			Con_ToggleConsole_f ();
 			break;
 		case 2:
-			Cbuf_AddText ("exec default.cfg\n");
+			M_Menu_Reset_f ();
 			break;
 		case 3:
 			M_Menu_Video_f ();
 			break;
-		case 4:
+		case 11:
+			M_Menu_Options_ColorControl_f ();
+			break;
+		case 17: // Customize Effects
 			M_Menu_Options_Effects_f ();
 			break;
+		case 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 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 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 21:
+			M_Menu_Options_Graphics_f ();
+			break;
+		case 22: // Lighting: Flares
+			Cbuf_AddText("r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+			break;
+		case 23: // Lighting: Normal
+			Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+			break;
+		case 24: // Lighting: High
+			Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+			break;
+		case 25: // Lighting: Full
+			Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+			break;
+		case 26:
+			M_Menu_ModList_f ();
+			break;
 		default:
 			M_Menu_Options_AdjustSliders (1);
 			break;
@@ -1453,14 +1768,14 @@ void M_Options_Key (int k)
 		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;
@@ -1476,9 +1791,9 @@ void M_Options_Key (int k)
 	}
 }
 
-#define	OPTIONS_EFFECTS_ITEMS	16
+#define	OPTIONS_EFFECTS_ITEMS	35
 
-int options_effects_cursor;
+static int options_effects_cursor;
 
 void M_Menu_Options_Effects_f (void)
 {
@@ -1488,113 +1803,121 @@ 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_stainmaps_clearonload;
 extern cvar_t r_explosionclip;
-extern cvar_t r_dlightmap;
-extern cvar_t r_modellights;
 extern cvar_t r_coronas;
 extern cvar_t gl_flashblend;
-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_size;
-extern cvar_t cl_particles_blood_alpha;
-
-void M_Menu_Options_Effects_AdjustSliders (int dir)
+extern cvar_t cl_beams_polygons;
+extern cvar_t cl_beams_quakepositionhack;
+extern cvar_t cl_beams_instantaimhack;
+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;
+
+static void M_Menu_Options_Effects_AdjustSliders (int dir)
 {
-	S_LocalSound ("misc/menu3.wav");
-
-	switch (options_effects_cursor)
-	{
-	case 0:
-		Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
-		break;
-	case 1:
-		Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer);
-		break;
-	case 2:
-		Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
-		break;
-	case 3:
-		Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
-		break;
-	case 4:
-		Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
-		break;
-	case 5:
-		Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
-		break;
-	case 6:
-		Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
-		break;
-	case 7:
-		Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
-		break;
-	case 8:
-		Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
-		break;
-	case 9:
-		Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
-		break;
-	case 10:
-		Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
-		break;
-	case 11:
-		Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
-		break;
-	case 12:
-		Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
-		break;
-	case 13:
-		Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
-		break;
-	case 14:
-		Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
-		break;
-	case 15:
-		Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
-		break;
-	}
+	int optnum;
+	S_LocalSound ("sound/misc/menu3.wav");
+
+	optnum = 0;
+	     if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quake, !cl_particles_quake.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
+	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_stainmaps_clearonload, !cl_stainmaps_clearonload.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+	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_instantaimhack, !cl_beams_instantaimhack.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_quakepositionhack, !cl_beams_quakepositionhack.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 (&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));
+	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));
 }
 
-void M_Options_Effects_Draw (void)
+static void M_Options_Effects_Draw (void)
 {
-	float y;
+	int visible;
 	cachepic_t	*p;
 
-	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");
-
-	y = 32;
-	M_Print(16, y, "      Lights Per Model");M_DrawSlider(220, y, r_modellights.value / 8);y += 8;
-	M_Print(16, y, " Fast Dynamic Lighting");M_DrawCheckbox(220, y, !r_dlightmap.integer);y += 8;
-	M_Print(16, y, "               Coronas");M_DrawCheckbox(220, y, r_coronas.integer);y += 8;
-	M_Print(16, y, "      Use Only Coronas");M_DrawCheckbox(220, y, gl_flashblend.integer);y += 8;
-	M_Print(16, y, "             Particles");M_DrawCheckbox(220, y, cl_particles.integer);y += 8;
-	M_Print(16, y, "            Explosions");M_DrawCheckbox(220, y, cl_explosions.integer);y += 8;
-	M_Print(16, y, "    Explosion Clipping");M_DrawCheckbox(220, y, r_explosionclip.integer);y += 8;
-	M_Print(16, y, "             Stainmaps");M_DrawCheckbox(220, y, cl_stainmaps.integer);y += 8;
-	M_Print(16, y, "      Detail Texturing");M_DrawCheckbox(220, y, r_detailtextures.integer);y += 8;
-	M_Print(16, y, "        Bullet Impacts");M_DrawCheckbox(220, y, cl_particles_bulletimpacts.integer);y += 8;
-	M_Print(16, y, "                 Smoke");M_DrawCheckbox(220, y, cl_particles_smoke.integer);y += 8;
-	M_Print(16, y, "                Sparks");M_DrawCheckbox(220, y, cl_particles_sparks.integer);y += 8;
-	M_Print(16, y, "               Bubbles");M_DrawCheckbox(220, y, cl_particles_bubbles.integer);y += 8;
-	M_Print(16, y, "                 Blood");M_DrawCheckbox(220, y, cl_particles_blood.integer);y += 8;
-	M_Print(16, y, "            Blood Size");M_DrawSlider(220, y, (cl_particles_blood_size.value - 2) / 18);y += 8;
-	M_Print(16, y, "         Blood Opacity");M_DrawSlider(220, y, (cl_particles_blood_alpha.value - 0.2) / 0.8);y += 8;
-
-	// cursor
-	M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1));
+	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");
+	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+
+	optcursor = options_effects_cursor;
+	optnum = 0;
+	visible = (int)((menu_height - 32) / 8);
+	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
+
+	M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
+	M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer);
+	M_Options_PrintSlider(  "     Particles Quality", true, cl_particles_quality.value, 1, 4);
+	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_stainmaps_clearonload.integer);
+	M_Options_PrintCheckbox("                Decals", true, cl_decals.integer);
+	M_Options_PrintCheckbox("        Bullet Impacts", true, cl_particles_bulletimpacts.integer);
+	M_Options_PrintCheckbox("                 Smoke", true, cl_particles_smoke.integer);
+	M_Options_PrintCheckbox("                Sparks", true, cl_particles_sparks.integer);
+	M_Options_PrintCheckbox("               Bubbles", true, cl_particles_bubbles.integer);
+	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("     Polygon Lightning", true, cl_beams_polygons.integer);
+	M_Options_PrintCheckbox("Smooth Sweep Lightning", true, cl_beams_instantaimhack.integer);
+	M_Options_PrintCheckbox(" Waist-level Lightning", true, cl_beams_quakepositionhack.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_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);
+	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);
 }
 
 
-void M_Options_Effects_Key (int k)
+static void M_Options_Effects_Key (int k, int ascii)
 {
 	switch (k)
 	{
@@ -1607,14 +1930,14 @@ void M_Options_Effects_Key (int k)
 		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;
@@ -1630,23 +1953,409 @@ void M_Options_Effects_Key (int k)
 	}
 }
 
-//=============================================================================
-/* KEYS MENU */
 
-char *quakebindnames[][2] =
+#define	OPTIONS_GRAPHICS_ITEMS	20
+
+static int options_graphics_cursor;
+
+void M_Menu_Options_Graphics_f (void)
 {
-{"+attack", 		"attack"},
-{"impulse 10", 		"next weapon"},
-{"impulse 12", 		"previous weapon"},
-{"+jump", 			"jump / swim up"},
-{"+forward", 		"walk forward"},
-{"+back", 			"backpedal"},
-{"+left", 			"turn left"},
-{"+right", 			"turn right"},
-{"+speed", 			"run"},
-{"+moveleft", 		"step left"},
-{"+moveright", 		"step right"},
-{"+strafe", 		"sidestep"},
+	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_lightmaps;
+extern cvar_t r_shadow_realtime_world_shadows;
+extern cvar_t r_bloom;
+extern cvar_t r_bloom_colorscale;
+extern cvar_t r_bloom_colorsubtract;
+extern cvar_t r_bloom_colorexponent;
+extern cvar_t r_bloom_blur;
+extern cvar_t r_bloom_brighten;
+extern cvar_t r_bloom_resolution;
+extern cvar_t r_hdr;
+extern cvar_t r_hdr_scenebrightness;
+extern cvar_t r_hdr_glowintensity;
+extern cvar_t r_hdr_range;
+extern cvar_t gl_picmip;
+
+static void M_Menu_Options_Graphics_AdjustSliders (int dir)
+{
+	int optnum;
+	S_LocalSound ("sound/misc/menu3.wav");
+
+	optnum = 0;
+
+	     if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss,							bound(0, r_shadow_gloss.integer + dir, 2));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight,				!r_shadow_realtime_dlight.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows,		!r_shadow_realtime_dlight_shadows.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world,					!r_shadow_realtime_world.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps,		bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows,			!r_shadow_realtime_world_shadows.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness,                   bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom,                                 !r_bloom.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr,                                   !r_hdr.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_range,                             bound(1, r_hdr_range.value + dir * 0.25, 16));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_glowintensity,                     bound(0, r_hdr_glowintensity.value + dir * 0.25, 4));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorscale,                      bound(0.0625, r_bloom_colorscale.value + dir * 0.0625, 1));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorsubtract,                   bound(0, r_bloom_colorsubtract.value + dir * 0.0625, 1-0.0625));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent,                   bound(1, r_bloom_colorexponent.value * (dir > 0 ? 2.0 : 0.5), 8));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_brighten,                        bound(1, r_bloom_brighten.value + dir * 0.0625, 4));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_blur,                            bound(1, r_bloom_blur.value + dir * 1, 16));
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_resolution,                      bound(64, r_bloom_resolution.value + dir * 64, 2048));
+	else if (options_graphics_cursor == optnum++) Cbuf_AddText ("r_restart\n");
+}
+
+
+static void M_Options_Graphics_Draw (void)
+{
+	int visible;
+	cachepic_t	*p;
+
+	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");
+	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+
+	optcursor = options_graphics_cursor;
+	optnum = 0;
+	visible = (int)((menu_height - 32) / 8);
+	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
+
+	M_Options_PrintSlider(  "      Corona Intensity", true, r_coronas.value, 0, 4);
+	M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
+	M_Options_PrintSlider(  "            Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
+	M_Options_PrintCheckbox("            RT DLights", !gl_flashblend.integer, r_shadow_realtime_dlight.integer);
+	M_Options_PrintCheckbox("     RT DLight Shadows", !gl_flashblend.integer, r_shadow_realtime_dlight_shadows.integer);
+	M_Options_PrintCheckbox("              RT World", true, r_shadow_realtime_world.integer);
+	M_Options_PrintSlider(  "    RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
+	M_Options_PrintCheckbox("       RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
+	M_Options_PrintSlider(  "      Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
+	M_Options_PrintCheckbox("          Bloom Effect", !r_hdr.integer, r_bloom.integer);
+	M_Options_PrintCheckbox("      HDR Bloom Effect", true, r_hdr.integer);
+	M_Options_PrintSlider(  "     HDR Dynamic Range", r_hdr.integer, r_hdr_range.value, 1, 16);
+	M_Options_PrintSlider(  "    HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4);
+	M_Options_PrintSlider(  "     Bloom Color Scale", r_hdr.integer || r_bloom.integer, r_bloom_colorscale.value, 0.0625, 1);
+	M_Options_PrintSlider(  "  Bloom Color Subtract", r_hdr.integer || r_bloom.integer, r_bloom_colorsubtract.value, 0, 1-0.0625);
+	M_Options_PrintSlider(  "  Bloom Color Exponent", r_hdr.integer || r_bloom.integer, r_bloom_colorexponent.value, 1, 8);
+	M_Options_PrintSlider(  "       Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_brighten.value, 1, 4);
+	M_Options_PrintSlider(  "            Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16);
+	M_Options_PrintSlider(  "      Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048);
+	M_Options_PrintCommand( "      Restart Renderer", true);
+}
+
+
+static void M_Options_Graphics_Key (int k, int 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
+
+static int		options_colorcontrol_cursor;
+
+// intensity value to match up to 50% dither to 'correct' quake
+static cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.5", "intensity value that matches up to white/black dither pattern, should be 0.5 for linear color"};
+
+void M_Menu_Options_ColorControl_f (void)
+{
+	key_dest = key_menu;
+	m_state = m_options_colorcontrol;
+	m_entersound = true;
+}
+
+
+static void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+{
+	int optnum;
+	float f;
+	S_LocalSound ("sound/misc/menu3.wav");
+
+	optnum = 1;
+	if (options_colorcontrol_cursor == optnum++)
+		Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 0);
+		Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.125, 5));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 0);
+		Cvar_SetValueQuick (&v_contrast, bound(1, v_contrast.value + dir * 0.125, 5));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 0);
+		Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, !v_color_enable.integer);
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_black_r, bound(0, v_color_black_r.value + dir * 0.0125, 0.8));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_black_g, bound(0, v_color_black_g.value + dir * 0.0125, 0.8));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_black_b, bound(0, v_color_black_b.value + dir * 0.0125, 0.8));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		f = bound(0, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3 + dir * 0.0125, 0.8);
+		Cvar_SetValueQuick (&v_color_black_r, f);
+		Cvar_SetValueQuick (&v_color_black_g, f);
+		Cvar_SetValueQuick (&v_color_black_b, f);
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_grey_r, bound(0, v_color_grey_r.value + dir * 0.0125, 0.95));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_grey_g, bound(0, v_color_grey_g.value + dir * 0.0125, 0.95));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_grey_b, bound(0, v_color_grey_b.value + dir * 0.0125, 0.95));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		f = bound(0, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3 + dir * 0.0125, 0.95);
+		Cvar_SetValueQuick (&v_color_grey_r, f);
+		Cvar_SetValueQuick (&v_color_grey_g, f);
+		Cvar_SetValueQuick (&v_color_grey_b, f);
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_white_r, bound(1, v_color_white_r.value + dir * 0.125, 5));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_white_g, bound(1, v_color_white_g.value + dir * 0.125, 5));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		Cvar_SetValueQuick (&v_color_white_b, bound(1, v_color_white_b.value + dir * 0.125, 5));
+	}
+	else if (options_colorcontrol_cursor == optnum++)
+	{
+		Cvar_SetValueQuick (&v_color_enable, 1);
+		f = bound(1, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3 + dir * 0.125, 5);
+		Cvar_SetValueQuick (&v_color_white_r, f);
+		Cvar_SetValueQuick (&v_color_white_g, f);
+		Cvar_SetValueQuick (&v_color_white_b, f);
+	}
+}
+
+static void M_Options_ColorControl_Draw (void)
+{
+	int visible;
+	float x, c, s, t, u, v;
+	cachepic_t	*p, *dither;
+
+	dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP);
+
+	M_Background(320, 256);
+
+	M_DrawPic(16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/p_option");
+	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+
+	optcursor = options_colorcontrol_cursor;
+	optnum = 0;
+	visible = (int)((menu_height - 32) / 8);
+	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8;
+
+	M_Options_PrintCommand( "     Reset to defaults", true);
+	M_Options_PrintCheckbox("Hardware Gamma Control", vid_hardwaregammasupported.integer, v_hwgamma.integer);
+	M_Options_PrintSlider(  "                 Gamma", !v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_gamma.value, 1, 5);
+	M_Options_PrintSlider(  "              Contrast", !v_color_enable.integer, v_contrast.value, 1, 5);
+	M_Options_PrintSlider(  "            Brightness", !v_color_enable.integer, v_brightness.value, 0, 0.8);
+	M_Options_PrintCheckbox("  Color Level Controls", true, v_color_enable.integer);
+	M_Options_PrintSlider(  "          Black: Red  ", v_color_enable.integer, v_color_black_r.value, 0, 0.8);
+	M_Options_PrintSlider(  "          Black: Green", v_color_enable.integer, v_color_black_g.value, 0, 0.8);
+	M_Options_PrintSlider(  "          Black: Blue ", v_color_enable.integer, v_color_black_b.value, 0, 0.8);
+	M_Options_PrintSlider(  "          Black: Grey ", v_color_enable.integer, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8);
+	M_Options_PrintSlider(  "           Grey: Red  ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95);
+	M_Options_PrintSlider(  "           Grey: Green", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95);
+	M_Options_PrintSlider(  "           Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95);
+	M_Options_PrintSlider(  "           Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);
+	M_Options_PrintSlider(  "          White: Red  ", v_color_enable.integer, v_color_white_r.value, 1, 5);
+	M_Options_PrintSlider(  "          White: Green", v_color_enable.integer, v_color_white_g.value, 1, 5);
+	M_Options_PrintSlider(  "          White: Blue ", v_color_enable.integer, v_color_white_b.value, 1, 5);
+	M_Options_PrintSlider(  "          White: Grey ", v_color_enable.integer, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);
+
+	opty += 4;
+	DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
+	s = (float) 312 / 2 * vid.width / vid_conwidth.integer;
+	t = (float) 4 / 2 * vid.height / vid_conheight.integer;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL  , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL  , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL  , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4;
+	DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL  , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);opty += 4;
+
+	c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake
+	s = (float) 48 / 2 * vid.width / vid_conwidth.integer;
+	t = (float) 48 / 2 * vid.height / vid_conheight.integer;
+	u = s * 0.5;
+	v = t * 0.5;
+	opty += 8;
+	x = 4;
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0);
+	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
+	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
+	x += 80;
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0);
+	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
+	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
+	x += 80;
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0);
+	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
+	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
+	x += 80;
+	DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0);
+	DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
+	DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
+}
+
+
+static void M_Options_ColorControl_Key (int k, int ascii)
+{
+	switch (k)
+	{
+	case K_ESCAPE:
+		M_Menu_Options_f ();
+		break;
+
+	case K_ENTER:
+		m_entersound = true;
+		switch (options_colorcontrol_cursor)
+		{
+		case 0:
+			Cvar_SetValueQuick(&v_hwgamma, 1);
+			Cvar_SetValueQuick(&v_gamma, 1);
+			Cvar_SetValueQuick(&v_contrast, 1);
+			Cvar_SetValueQuick(&v_brightness, 0);
+			Cvar_SetValueQuick(&v_color_enable, 0);
+			Cvar_SetValueQuick(&v_color_black_r, 0);
+			Cvar_SetValueQuick(&v_color_black_g, 0);
+			Cvar_SetValueQuick(&v_color_black_b, 0);
+			Cvar_SetValueQuick(&v_color_grey_r, 0);
+			Cvar_SetValueQuick(&v_color_grey_g, 0);
+			Cvar_SetValueQuick(&v_color_grey_b, 0);
+			Cvar_SetValueQuick(&v_color_white_r, 1);
+			Cvar_SetValueQuick(&v_color_white_g, 1);
+			Cvar_SetValueQuick(&v_color_white_b, 1);
+			break;
+		default:
+			M_Menu_Options_ColorControl_AdjustSliders (1);
+			break;
+		}
+		return;
+
+	case K_UPARROW:
+		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 ("sound/misc/menu1.wav");
+		options_colorcontrol_cursor++;
+		if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
+			options_colorcontrol_cursor = 0;
+		break;
+
+	case K_LEFTARROW:
+		M_Menu_Options_ColorControl_AdjustSliders (-1);
+		break;
+
+	case K_RIGHTARROW:
+		M_Menu_Options_ColorControl_AdjustSliders (1);
+		break;
+	}
+}
+
+
+//=============================================================================
+/* KEYS MENU */
+
+static const char *quakebindnames[][2] =
+{
+{"+attack", 		"attack"},
+{"impulse 10", 		"next weapon"},
+{"impulse 12", 		"previous weapon"},
+{"+jump", 			"jump / swim up"},
+{"+forward", 		"walk forward"},
+{"+back", 			"backpedal"},
+{"+left", 			"turn left"},
+{"+right", 			"turn right"},
+{"+speed", 			"run"},
+{"+moveleft", 		"step left"},
+{"+moveright", 		"step right"},
+{"+strafe", 		"sidestep"},
 {"+lookup", 		"look up"},
 {"+lookdown", 		"look down"},
 {"centerview", 		"center view"},
@@ -1656,8 +2365,9 @@ char *quakebindnames[][2] =
 {"+movedown",		"swim down"}
 };
 
-char *transfusionbindnames[][2] =
+static const char *transfusionbindnames[][2] =
 {
+{"",				"Movement"},		// Movement commands
 {"+forward", 		"walk forward"},
 {"+back", 			"backpedal"},
 {"+left", 			"turn left"},
@@ -1666,34 +2376,78 @@ char *transfusionbindnames[][2] =
 {"+moveright", 		"step right"},
 {"+jump", 			"jump / swim up"},
 {"+movedown",		"swim down"},
-{"+attack", 		"attack"},
-{"+button3",		"altfire"},
+{"",				"Combat"},			// Combat commands
 {"impulse 1",		"Pitch Fork"},
 {"impulse 2",		"Flare Gun"},
 {"impulse 3",		"Shotgun"},
 {"impulse 4",		"Machine Gun"},
 {"impulse 5",		"Incinerator"},
-{"impulse 6",		"Bombs"},
+{"impulse 6",		"Bombs (TNT)"},
+{"impulse 35",		"Proximity Bomb"},
+{"impulse 36",		"Remote Detonator"},
 {"impulse 7",		"Aerosol Can"},
 {"impulse 8",		"Tesla Cannon"},
 {"impulse 9",		"Life Leech"},
-{"impulse 17",		"Voodoo Doll"},
-{"impulse 11",		"previous weapon"},
-{"impulse 10",		"next weapon"},
-{"impulse 14",		"previous item"},
-{"impulse 15",		"next item"},
-{"impulse 13",		"use item"},
-{"impulse 100",		"add bot (red)"},
-{"impulse 101",		"add bot (blue)"},
-{"impulse 102",		"kick a bot"},
-{"impulse 50",		"voting menu"},
-{"impulse 141",		"identify player"},
-{"impulse 16",		"next armor type"},
-{"impulse 20",		"observer mode"}
+{"impulse 10",		"Voodoo Doll"},
+{"impulse 21",		"next weapon"},
+{"impulse 22",		"previous weapon"},
+{"+attack", 		"attack"},
+{"+button3",		"altfire"},
+{"",				"Inventory"},		// Inventory commands
+{"impulse 40",		"Dr.'s Bag"},
+{"impulse 41",		"Crystal Ball"},
+{"impulse 42",		"Beast Vision"},
+{"impulse 43",		"Jump Boots"},
+{"impulse 23",		"next item"},
+{"impulse 24",		"previous item"},
+{"impulse 25",		"use item"},
+{"",				"Misc"},			// Misc commands
+{"+button4",		"use"},
+{"impulse 50",		"add bot (red)"},
+{"impulse 51",		"add bot (blue)"},
+{"impulse 52",		"kick a bot"},
+{"impulse 26",		"next armor type"},
+{"impulse 27",		"identify player"},
+{"impulse 55",		"voting menu"},
+{"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"}
+};
+
+static const char *goodvsbad2bindnames[][2] =
+{
+{"impulse 69",		"Power 1"},
+{"impulse 70",		"Power 2"},
+{"impulse 71",		"Power 3"},
+{"+jump", 			"jump / swim up"},
+{"+forward", 		"walk forward"},
+{"+back", 			"backpedal"},
+{"+left", 			"turn left"},
+{"+right", 			"turn right"},
+{"+speed", 			"run"},
+{"+moveleft", 		"step left"},
+{"+moveright", 		"step right"},
+{"+strafe", 		"sidestep"},
+{"+lookup", 		"look up"},
+{"+lookdown", 		"look down"},
+{"centerview", 		"center view"},
+{"+mlook", 			"mouse look"},
+{"kill", 			"kill yourself"},
+{"+moveup",			"swim up"},
+{"+movedown",		"swim down"}
 };
 
-int numcommands;
-char *(*bindnames)[2];
+static int numcommands;
+static const char *(*bindnames)[2];
 
 /*
 typedef struct binditem_s
@@ -1711,9 +2465,9 @@ typedef struct bindcategory_s
 }
 bindcategory_t;
 
-bindcategory_t *bindcategories = NULL;
+static bindcategory_t *bindcategories = NULL;
 
-void M_ClearBinds (void)
+static void M_ClearBinds (void)
 {
 	for (c = bindcategories;c;c = cnext)
 	{
@@ -1728,17 +2482,17 @@ void M_ClearBinds (void)
 	bindcategories = NULL;
 }
 
-void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
+static void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
 {
 	for (b = &c->binds;*b;*b = &(*b)->next);
 	*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);
 }
 
-void M_AddBind (char *category, char *command, char *description)
+static void M_AddBind (char *category, char *command, char *description)
 {
 	for (c = &bindcategories;*c;c = &(*c)->next)
 	{
@@ -1752,7 +2506,7 @@ void M_AddBind (char *category, char *command, char *description)
 	M_AddBindToCategory(*c, command, description);
 }
 
-void M_DefaultBinds (void)
+static void M_DefaultBinds (void)
 {
 	M_ClearBinds();
 	M_AddBind("movement", "+jump", "jump / swim up");
@@ -1786,87 +2540,99 @@ void M_DefaultBinds (void)
 */
 
 
-int		keys_cursor;
-int		bind_grab;
+static int		keys_cursor;
+static int		bind_grab;
 
 void M_Menu_Keys_f (void)
 {
-	key_dest = key_menu;
+	key_dest = key_menu_grabbed;
 	m_state = m_keys;
 	m_entersound = true;
-}
-
-#define NUMKEYS 5
-
-void M_FindKeysForCommand (char *command, int *keys)
-{
-	int		count;
-	int		j;
-	char	*b;
-
-	for (j = 0;j < NUMKEYS;j++)
-		keys[j] = -1;
 
-	count = 0;
+	if (gamemode == GAME_TRANSFUSION)
+	{
+		numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
+		bindnames = transfusionbindnames;
+	}
+	else if (gamemode == GAME_GOODVSBAD2)
+	{
+		numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]);
+		bindnames = goodvsbad2bindnames;
+	}
+	else
+	{
+		numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
+		bindnames = quakebindnames;
+	}
 
-	for (j=0 ; j<256 ; j++)
+	// Make sure "keys_cursor" doesn't start on a section in the binding list
+	keys_cursor = 0;
+	while (bindnames[keys_cursor][0][0] == '\0')
 	{
-		b = keybindings[j];
-		if (!b)
-			continue;
-		if (!strcmp (b, command) )
-		{
-			keys[count++] = j;
-			if (count == NUMKEYS)
-				break;
-		}
+		keys_cursor++;
+
+		// Only sections? There may be a problem somewhere...
+		if (keys_cursor >= numcommands)
+			Sys_Error ("M_Init: The key binding list only contains sections");
 	}
 }
 
-void M_UnbindCommand (char *command)
+#define NUMKEYS 5
+
+static void M_UnbindCommand (const char *command)
 {
 	int		j;
-	char	*b;
+	const char	*b;
 
-	for (j=0 ; j<256 ; j++)
+	for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
 	{
-		b = keybindings[j];
+		b = keybindings[0][j];
 		if (!b)
 			continue;
 		if (!strcmp (b, command))
-			Key_SetBinding (j, "");
+			Key_SetBinding (j, 0, "");
 	}
 }
 
 
-void M_Keys_Draw (void)
+static void M_Keys_Draw (void)
 {
 	int		i, j;
 	int		keys[NUMKEYS];
 	int		y;
 	cachepic_t	*p;
-	char	keystring[1024];
+	char	keystring[MAX_INPUTLINE];
 
-	p = Draw_CachePic ("gfx/ttl_cstm.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
+	M_Background(320, 48 + 8 * numcommands);
+
+	p = Draw_CachePic ("gfx/ttl_cstm");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
 
 	if (bind_grab)
-		M_Print (12, 32, "Press a key or button for this action");
+		M_Print(12, 32, "Press a key or button for this action");
 	else
-		M_Print (18, 32, "Enter to change, backspace to clear");
+		M_Print(18, 32, "Enter to change, backspace to clear");
 
 // search for known bindings
 	for (i=0 ; i<numcommands ; i++)
 	{
 		y = 48 + 8*i;
 
-		M_Print (16, y, bindnames[i][1]);
+		// If there's no command, it's just a section
+		if (bindnames[i][0][0] == '\0')
+		{
+			M_PrintRed (4, y, "\x0D");  // #13 is the little arrow pointing to the right
+			M_PrintRed (16, y, bindnames[i][1]);
+			continue;
+		}
+		else
+			M_Print(16, y, bindnames[i][1]);
 
-		M_FindKeysForCommand (bindnames[i][0], keys);
+		Key_FindKeysForCommand (bindnames[i][0], keys, NUMKEYS, 0);
 
 		// LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer
 		if (keys[0] == -1)
-			strcpy(keystring, "???");
+			strlcpy(keystring, "???", sizeof(keystring));
 		else
 		{
 			keystring[0] = 0;
@@ -1875,12 +2641,12 @@ void M_Keys_Draw (void)
 				if (keys[j] != -1)
 				{
 					if (j > 0)
-						strcat(keystring, " or ");
-					strcat(keystring, Key_KeynumToString (keys[j]));
+						strlcat(keystring, " or ", sizeof(keystring));
+					strlcat(keystring, Key_KeynumToString (keys[j]), sizeof(keystring));
 				}
 			}
 		}
-		M_Print (150, y, keystring);
+		M_Print(150, y, keystring);
 	}
 
 	if (bind_grab)
@@ -1890,21 +2656,21 @@ void M_Keys_Draw (void)
 }
 
 
-void M_Keys_Key (int k)
+static void M_Keys_Key (int k, int ascii)
 {
 	char	cmd[80];
 	int		keys[NUMKEYS];
 
 	if (bind_grab)
 	{	// defining a key
-		S_LocalSound ("misc/menu1.wav");
+		S_LocalSound ("sound/misc/menu1.wav");
 		if (k == K_ESCAPE)
 		{
 			bind_grab = false;
 		}
 		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);
 		}
 
@@ -1920,23 +2686,31 @@ void M_Keys_Key (int k)
 
 	case K_LEFTARROW:
 	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
-		keys_cursor--;
-		if (keys_cursor < 0)
-			keys_cursor = numcommands-1;
+		S_LocalSound ("sound/misc/menu1.wav");
+		do
+		{
+			keys_cursor--;
+			if (keys_cursor < 0)
+				keys_cursor = numcommands-1;
+		}
+		while (bindnames[keys_cursor][0][0] == '\0');  // skip sections
 		break;
 
 	case K_DOWNARROW:
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		keys_cursor++;
-		if (keys_cursor >= numcommands)
-			keys_cursor = 0;
+		S_LocalSound ("sound/misc/menu1.wav");
+		do
+		{
+			keys_cursor++;
+			if (keys_cursor >= numcommands)
+				keys_cursor = 0;
+		}
+		while (bindnames[keys_cursor][0][0] == '\0');  // skip sections
 		break;
 
 	case K_ENTER:		// go into bind mode
-		M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
-		S_LocalSound ("misc/menu2.wav");
+		Key_FindKeysForCommand (bindnames[keys_cursor][0], keys, NUMKEYS, 0);
+		S_LocalSound ("sound/misc/menu2.wav");
 		if (keys[NUMKEYS - 1] != -1)
 			M_UnbindCommand (bindnames[keys_cursor][0]);
 		bind_grab = true;
@@ -1944,136 +2718,325 @@ void M_Keys_Key (int k)
 
 	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;
+}
+
+
+static void M_Reset_Key (int key, int ascii)
+{
+	switch (key)
+	{
+	case 'Y':
+	case 'y':
+		Cbuf_AddText ("cvar_resettodefaults_all;exec default.cfg\n");
+		// no break here since we also exit the menu
+
+	case K_ESCAPE:
+	case 'n':
+	case 'N':
+		m_state = m_options;
+		m_entersound = true;
+		break;
+
+	default:
+		break;
+	}
+}
+
+static 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 5
+video_resolution_t video_resolutions_hardcoded[] =
+{
+{"Standard 4x3"              ,  320, 240, 320, 240, 1     },
+{"Standard 4x3"              ,  400, 300, 400, 300, 1     },
+{"Standard 4x3"              ,  512, 384, 512, 384, 1     },
+{"Standard 4x3"              ,  640, 480, 640, 480, 1     },
+{"Standard 4x3"              ,  800, 600, 640, 480, 1     },
+{"Standard 4x3"              , 1024, 768, 640, 480, 1     },
+{"Standard 4x3"              , 1152, 864, 640, 480, 1     },
+{"Standard 4x3"              , 1280, 960, 640, 480, 1     },
+{"Standard 4x3"              , 1400,1050, 640, 480, 1     },
+{"Standard 4x3"              , 1600,1200, 640, 480, 1     },
+{"Standard 4x3"              , 1792,1344, 640, 480, 1     },
+{"Standard 4x3"              , 1856,1392, 640, 480, 1     },
+{"Standard 4x3"              , 1920,1440, 640, 480, 1     },
+{"Standard 4x3"              , 2048,1536, 640, 480, 1     },
+{"Short Pixel (CRT) 5x4"     ,  320, 256, 320, 256, 0.9375},
+{"Short Pixel (CRT) 5x4"     ,  640, 512, 640, 512, 0.9375},
+{"Short Pixel (CRT) 5x4"     , 1280,1024, 640, 512, 0.9375},
+{"Tall Pixel (CRT) 8x5"      ,  320, 200, 320, 200, 1.2   },
+{"Tall Pixel (CRT) 8x5"      ,  640, 400, 640, 400, 1.2   },
+{"Tall Pixel (CRT) 8x5"      ,  840, 525, 640, 400, 1.2   },
+{"Tall Pixel (CRT) 8x5"      ,  960, 600, 640, 400, 1.2   },
+{"Tall Pixel (CRT) 8x5"      , 1680,1050, 640, 400, 1.2   },
+{"Tall Pixel (CRT) 8x5"      , 1920,1200, 640, 400, 1.2   },
+{"Square Pixel (LCD) 5x4"    ,  320, 256, 320, 256, 1     },
+{"Square Pixel (LCD) 5x4"    ,  640, 512, 640, 512, 1     },
+{"Square Pixel (LCD) 5x4"    , 1280,1024, 640, 512, 1     },
+{"WideScreen 5x3"            ,  640, 384, 640, 384, 1     },
+{"WideScreen 5x3"            , 1280, 768, 640, 384, 1     },
+{"WideScreen 8x5"            ,  320, 200, 320, 200, 1     },
+{"WideScreen 8x5"            ,  640, 400, 640, 400, 1     },
+{"WideScreen 8x5"            ,  720, 450, 720, 450, 1     },
+{"WideScreen 8x5"            ,  840, 525, 640, 400, 1     },
+{"WideScreen 8x5"            ,  960, 600, 640, 400, 1     },
+{"WideScreen 8x5"            , 1280, 800, 640, 400, 1     },
+{"WideScreen 8x5"            , 1440, 900, 720, 450, 1     },
+{"WideScreen 8x5"            , 1680,1050, 640, 400, 1     },
+{"WideScreen 8x5"            , 1920,1200, 640, 400, 1     },
+{"WideScreen 8x5"            , 2560,1600, 640, 400, 1     },
+{"WideScreen 8x5"            , 3840,2400, 640, 400, 1     },
+{"WideScreen 14x9"           ,  840, 540, 640, 400, 1     },
+{"WideScreen 14x9"           , 1680,1080, 640, 400, 1     },
+{"WideScreen 16x9"           ,  640, 360, 640, 360, 1     },
+{"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     },
+{"WideScreen 16x9"           , 3840,2160, 640, 360, 1     },
+{"NTSC 3x2"                  ,  360, 240, 360, 240, 1.125 },
+{"NTSC 3x2"                  ,  720, 480, 720, 480, 1.125 },
+{"PAL 14x11"                 ,  360, 283, 360, 283, 0.9545},
+{"PAL 14x11"                 ,  720, 566, 720, 566, 0.9545},
+{"NES 8x7"                   ,  256, 224, 256, 224, 1.1667},
+{"SNES 8x7"                  ,  512, 448, 512, 448, 1.1667},
+{NULL, 0, 0, 0, 0, 0}
+};
+// this is the number of the default mode (640x480) in the list above
+int video_resolutions_hardcoded_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
 
-int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 80, 92, 116};
-unsigned short video_resolutions[][2] = {{512,384}, {640,480}, {800,600}, {1024,768}, {1280,960}};
-int video_resolution;
+#define VIDEO_ITEMS 11
+static int video_cursor = 0;
+static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168};
+static int menu_video_resolution;
 
-extern int current_vid_fullscreen;
-extern int current_vid_width;
-extern int current_vid_height;
-extern int current_vid_bitsperpixel;
-extern int current_vid_stencil;
+video_resolution_t *video_resolutions;
+int video_resolutions_count;
 
+static video_resolution_t *menu_video_resolutions;
+static int menu_video_resolutions_count;
+static qboolean menu_video_resolutions_forfullscreen;
 
-void M_Menu_Video_f (void)
+static void M_Menu_Video_FindResolution(int w, int h, float a)
 {
-	key_dest = key_menu;
-	m_state = m_video;
-	m_entersound = true;
+	int i;
 
-	// Look for the current resolution
-	for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_resolution++)
+	if(menu_video_resolutions_forfullscreen)
 	{
-		if (video_resolutions[video_resolution][0] == current_vid_width &&
-			video_resolutions[video_resolution][1] == current_vid_height)
-			break;
+		menu_video_resolutions = video_resolutions;
+		menu_video_resolutions_count = video_resolutions_count;
+	}
+	else
+	{
+		menu_video_resolutions = video_resolutions_hardcoded;
+		menu_video_resolutions_count = video_resolutions_hardcoded_count;
 	}
 
-	// Default to 800x600 if we didn't find it
-	if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
+	// Look for the closest match to the current resolution
+	menu_video_resolution = 0;
+	for (i = 1;i < menu_video_resolutions_count;i++)
 	{
-		video_resolution = 2;
-		Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
-		Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+		// if the new mode would be a worse match in width, skip it
+		if (abs(menu_video_resolutions[i].width - w) > abs(menu_video_resolutions[menu_video_resolution].width - w))
+			continue;
+		// if it is equal in width, check height
+		if (menu_video_resolutions[i].width == w && menu_video_resolutions[menu_video_resolution].width == w)
+		{
+			// if the new mode would be a worse match in height, skip it
+			if (abs(menu_video_resolutions[i].height - h) > abs(menu_video_resolutions[menu_video_resolution].height - h))
+				continue;
+			// if it is equal in width and height, check pixel aspect
+			if (menu_video_resolutions[i].height == h && menu_video_resolutions[menu_video_resolution].height == h)
+			{
+				// if the new mode would be a worse match in pixel aspect, skip it
+				if (abs(menu_video_resolutions[i].pixelheight - a) > abs(menu_video_resolutions[menu_video_resolution].pixelheight - a))
+					continue;
+				// if it is equal in everything, skip it (prefer earlier modes)
+				if (menu_video_resolutions[i].pixelheight == a && menu_video_resolutions[menu_video_resolution].pixelheight == a)
+					continue;
+				// better match for width, height, and pixel aspect
+				menu_video_resolution = i;
+			}
+			else // better match for width and height
+				menu_video_resolution = i;
+		}
+		else // better match for width
+			menu_video_resolution = i;
 	}
 }
 
+void M_Menu_Video_f (void)
+{
+	key_dest = key_menu;
+	m_state = m_video;
+	m_entersound = true;
+
+	M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value);
+}
+
 
-void M_Video_Draw (void)
+static void M_Video_Draw (void)
 {
+	int t;
 	cachepic_t	*p;
-	const char* string;
 
-	M_DrawPic(16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic("gfx/vidmodes.lmp");
-	M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp");
+	if(!!vid_fullscreen.integer != menu_video_resolutions_forfullscreen)
+	{
+		video_resolution_t *res = &menu_video_resolutions[menu_video_resolution];
+		menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer;
+		M_Menu_Video_FindResolution(res->width, res->height, res->pixelheight);
+	}
 
-	// Resolution
-	M_Print(16, video_cursor_table[0], "            Resolution");
-	string = va("%dx%d", video_resolutions[video_resolution][0], video_resolutions[video_resolution][1]);
-	M_Print (220, video_cursor_table[0], string);
+	M_Background(320, 200);
 
-	// Bits per pixel
-	M_Print(16, video_cursor_table[1], "        Bits per pixel");
-	M_Print (220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+	M_DrawPic(16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/vidmodes");
+	M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
 
-	// Fullscreen
-	M_Print(16, video_cursor_table[2], "            Fullscreen");
-	M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer);
+	t = 0;
 
-	// Stencil
-	M_Print(16, video_cursor_table[3], "               Stencil");
-	M_DrawCheckbox(220, video_cursor_table[3], vid_stencil.integer);
+	// 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 %.2fhz", vid.width, vid.height, vid.refreshrate));
+	else
+		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", menu_video_resolutions[menu_video_resolution].width, menu_video_resolutions[menu_video_resolution].height));
+	M_Print(96, video_cursor_table[t] + 8, va("Type: %s", menu_video_resolutions[menu_video_resolution].type));
+	t++;
+
+	// 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[t], "          Antialiasing");
+	M_DrawSlider(220, video_cursor_table[t], vid_samples.value, 1, 32);
+	t++;
+
+	// Refresh Rate
+	M_ItemPrint(16, video_cursor_table[t], "      Use Refresh Rate", vid_supportrefreshrate);
+	M_DrawCheckbox(220, video_cursor_table[t], vid_userefreshrate.integer);
+	t++;
+
+	// 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.value, 50, 150);
+	t++;
+
+	// 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[t], "         Vertical Sync", true);
+	M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer);
+	t++;
+
+	M_ItemPrint(16, video_cursor_table[t], "    Anisotropic Filter", vid.support.ext_texture_filter_anisotropic);
+	M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, vid.max_anisotropy);
+	t++;
+
+	M_ItemPrint(16, video_cursor_table[t], "       Texture Quality", true);
+	M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
+	t++;
+
+	M_ItemPrint(16, video_cursor_table[t], "   Texture Compression", vid.support.arb_texture_compression);
+	M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
+	t++;
 
 	// "Apply" button
-	M_Print(220, video_cursor_table[4], "Apply");
+	M_Print(220, video_cursor_table[t], "Apply");
+	t++;
 
 	// Cursor
 	M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
 }
 
 
-void M_Menu_Video_AdjustSliders (int dir)
+static void M_Menu_Video_AdjustSliders (int dir)
 {
-	S_LocalSound ("misc/menu3.wav");
+	int t;
 
-	switch (video_cursor)
+	S_LocalSound ("sound/misc/menu3.wav");
+
+	t = 0;
+	if (video_cursor == t++)
 	{
 		// Resolution
-		case 0:
+		int r;
+		for(r = 0;r < menu_video_resolutions_count;r++)
 		{
-			int new_resolution = video_resolution + dir;
-			if (new_resolution < 0)
-				video_resolution = sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1;
-			else if (new_resolution > (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1))
-				video_resolution = 0;
-			else
-				video_resolution = new_resolution;
-
-			Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
-			Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
-			break;
+			menu_video_resolution += dir;
+			if (menu_video_resolution >= menu_video_resolutions_count)
+				menu_video_resolution = 0;
+			if (menu_video_resolution < 0)
+				menu_video_resolution = menu_video_resolutions_count - 1;
+			if (menu_video_resolutions[menu_video_resolution].width >= vid_minwidth.integer && menu_video_resolutions[menu_video_resolution].height >= vid_minheight.integer)
+				break;
 		}
-
-		// Bits per pixel
-		case 1:
-			Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
-			break;
-		case 2:
-			Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
-			break;
-		case 3:
-			Cvar_SetValueQuick (&vid_stencil, !vid_stencil.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(50, vid_refreshrate.value + 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), vid.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);
 }
 
 
-void M_Video_Key (int key)
+static void M_Video_Key (int key, int ascii)
 {
 	switch (key)
 	{
 		case K_ESCAPE:
 			// vid_shared.c has a copy of the current video config. We restore it
-			Cvar_SetValueQuick(&vid_fullscreen, current_vid_fullscreen);
-			Cvar_SetValueQuick(&vid_width, current_vid_width);
-			Cvar_SetValueQuick(&vid_height, current_vid_height);
-			Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
-			Cvar_SetValueQuick(&vid_stencil, current_vid_stencil);
-
-			S_LocalSound ("misc/menu1.wav");
+			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 ();
 			break;
 
@@ -2081,7 +3044,12 @@ void M_Video_Key (int key)
 			m_entersound = true;
 			switch (video_cursor)
 			{
-				case 4:
+				case (VIDEO_ITEMS - 1):
+					Cvar_SetValueQuick (&vid_width, menu_video_resolutions[menu_video_resolution].width);
+					Cvar_SetValueQuick (&vid_height, menu_video_resolutions[menu_video_resolution].height);
+					Cvar_SetValueQuick (&vid_conwidth, menu_video_resolutions[menu_video_resolution].conwidth);
+					Cvar_SetValueQuick (&vid_conheight, menu_video_resolutions[menu_video_resolution].conheight);
+					Cvar_SetValueQuick (&vid_pixelheight, menu_video_resolutions[menu_video_resolution].pixelheight);
 					Cbuf_AddText ("vid_restart\n");
 					M_Menu_Options_f ();
 					break;
@@ -2091,14 +3059,14 @@ void M_Video_Key (int key)
 			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;
@@ -2117,7 +3085,7 @@ void M_Video_Key (int key)
 //=============================================================================
 /* HELP MENU */
 
-int		help_page;
+static int		help_page;
 #define	NUM_HELP_PAGES	6
 
 
@@ -2131,13 +3099,14 @@ void M_Menu_Help_f (void)
 
 
 
-void M_Help_Draw (void)
+static void M_Help_Draw (void)
 {
-	M_DrawPic (0, 0, va("gfx/help%i.lmp", help_page));
+	M_Background(320, 200);
+	M_DrawPic (0, 0, va("gfx/help%i", help_page));
 }
 
 
-void M_Help_Key (int key)
+static void M_Help_Key (int key, int ascii)
 {
 	switch (key)
 	{
@@ -2162,94 +3131,136 @@ void M_Help_Key (int key)
 
 }
 
+//=============================================================================
+/* CEDITS MENU */
+
+void M_Menu_Credits_f (void)
+{
+	key_dest = key_menu;
+	m_state = m_credits;
+	m_entersound = true;
+}
+
+
+
+static void M_Credits_Draw (void)
+{
+	M_Background(640, 480);
+	M_DrawPic (0, 0, "gfx/creditsmiddle");
+	M_Print (640/2 - 14/2*8, 236, "Coming soon...");
+	M_DrawPic (0, 0, "gfx/creditstop");
+	M_DrawPic (0, 433, "gfx/creditsbottom");
+}
+
+
+static void M_Credits_Key (int key, int ascii)
+{
+		M_Menu_Main_f ();
+}
+
 //=============================================================================
 /* QUIT MENU */
 
-int		msgNumber;
-int		m_quit_prevstate;
-qboolean	wasInMenus;
+static const char *m_quit_message[9];
+static int		m_quit_prevstate;
+static qboolean	wasInMenus;
 
-char *quitMessage [] =
+
+static int M_QuitMessage(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6, const char *line7, const char *line8)
 {
-/* .........1.........2.... */
-/*
-  "  Are you gonna quit    ",
-  "  this game just like   ",
-  "   everything else?     ",
-  "                        ",
-
-  " Milord, methinks that  ",
-  "   thou art a lowly     ",
-  " quitter. Is this true? ",
-  "                        ",
-
-  " Do I need to bust your ",
-  "  face open for trying  ",
-  "        to quit?        ",
-  "                        ",
-
-  " Man, I oughta smack you",
-  "   for trying to quit!  ",
-  "     Press Y to get     ",
-  "      smacked out.      ",
-
-  " Press Y to quit like a ",
-  "   big loser in life.   ",
-  "  Press N to stay proud ",
-  "    and successful!     ",
-
-  "   If you press Y to    ",
-  "  quit, I will summon   ",
-  "  Satan all over your   ",
-  "      hard drive!       ",
-
-  "  Um, Asmodeus dislikes ",
-  " his children trying to ",
-  " quit. Press Y to return",
-  "   to your Tinkertoys.  ",
-
-  "  If you quit now, I'll ",
-  "  throw a blanket-party ",
-  "   for you next time!   ",
-  "                        "
-  */
-
-/* .........1.........2.... */
-  "                        ",
-  "    Tired of fragging   ",
-  "        already?        ",
-  "                        ",
-
-  "                        ",
-  "  Quit now and forfeit  ",
-  "     your bodycount?    ",
-  "                        ",
-
-  "                        ",
-  "    Are you sure you    ",
-  "      want to quit?     ",
-  "                        ",
-
-  "                        ",
-  "   Off to do something  ",
-  "      constructive?     ",
-  "                        ",
-};
+	m_quit_message[0] = line1;
+	m_quit_message[1] = line2;
+	m_quit_message[2] = line3;
+	m_quit_message[3] = line4;
+	m_quit_message[4] = line5;
+	m_quit_message[5] = line6;
+	m_quit_message[6] = line7;
+	m_quit_message[7] = line8;
+	m_quit_message[8] = NULL;
+	return 1;
+}
+
+static int M_ChooseQuitMessage(int request)
+{
+	if (m_missingdata)
+	{
+		// frag related quit messages are pointless for a fallback menu, so use something generic
+		if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+		return 0;
+	}
+	switch (gamemode)
+	{
+	case GAME_NORMAL:
+	case GAME_HIPNOTIC:
+	case GAME_ROGUE:
+	case GAME_NEHAHRA:
+	case GAME_DEFEATINDETAIL2:
+		if (request-- == 0) return M_QuitMessage("Are you gonna quit","this game just like","everything else?",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Milord, methinks that","thou art a lowly","quitter. Is this true?",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Do I need to bust your","face open for trying","to quit?",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Man, I oughta smack you","for trying to quit!","Press Y to get","smacked out.",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Press Y to quit like a","big loser in life.","Press N to stay proud","and successful!",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("If you press Y to","quit, I will summon","Satan all over your","hard drive!",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Um, Asmodeus dislikes","his children trying to","quit. Press Y to return","to your Tinkertoys.",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("If you quit now, I'll","throw a blanket-party","for you next time!",NULL,NULL,NULL,NULL,NULL);
+		break;
+	case GAME_GOODVSBAD2:
+		if (request-- == 0) return M_QuitMessage("Press Yes To Quit","...","Yes",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Do you really want to","Quit?","Play Good vs bad 3!",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("All your quit are","belong to long duck","dong",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Press Y to quit","","But are you too legit?",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("This game was made by","e@chip-web.com","It is by far the best","game ever made.",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Even I really dont","know of a game better","Press Y to quit","like rougue chedder",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("After you stop playing","tell the guys who made","counterstrike to just","kill themselves now",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Press Y to exit to DOS","","SSH login as user Y","to exit to Linux",NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Press Y like you","were waanderers","from Ys'",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("This game was made in","Nippon like the SS","announcer's saying ipon",NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("you","want to quit?",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Please stop playing","this stupid game",NULL,NULL,NULL,NULL,NULL,NULL);
+		break;
+	case GAME_BATTLEMECH:
+		if (request-- == 0) return M_QuitMessage("? WHY ?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Leave now and your mech is scrap!","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Accept Defeat?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Wait! There are more mechs to destroy!","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Where's your bloodlust?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+		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);
+		if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+		if (request-- == 0) return M_QuitMessage("Off to do something constructive?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+		break;
+	}
+	return 0;
+}
 
 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;
 	m_entersound = true;
-	msgNumber = rand()&3; //&7;
+	// count how many there are
+	for (n = 1;M_ChooseQuitMessage(n);n++);
+	// choose one
+	M_ChooseQuitMessage(rand() % n);
 }
 
 
-void M_Quit_Key (int key)
+static void M_Quit_Key (int key, int ascii)
 {
 	switch (key)
 	{
@@ -2258,7 +3269,7 @@ void M_Quit_Key (int key)
 	case 'N':
 		if (wasInMenus)
 		{
-			m_state = m_quit_prevstate;
+			m_state = (enum m_state_e)m_quit_prevstate;
 			m_entersound = true;
 		}
 		else
@@ -2276,29 +3287,41 @@ void M_Quit_Key (int key)
 	default:
 		break;
 	}
-
 }
 
-
-void M_Quit_Draw (void)
+static void M_Quit_Draw (void)
 {
-	M_DrawTextBox (56, 76, 24, 4);
-	M_Print (64, 84,  quitMessage[msgNumber*4+0]);
-	M_Print (64, 92,  quitMessage[msgNumber*4+1]);
-	M_Print (64, 100, quitMessage[msgNumber*4+2]);
-	M_Print (64, 108, quitMessage[msgNumber*4+3]);
+	int i, l, linelength, firstline, lastline, lines;
+	for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
+	{
+		if ((l = (int)strlen(m_quit_message[i])))
+		{
+			if (firstline > i)
+				firstline = i;
+			if (lastline < i)
+				lastline = i;
+			if (linelength < l)
+				linelength = l;
+		}
+	}
+	lines = (lastline - firstline) + 1;
+	M_Background(linelength * 8 + 16, lines * 8 + 16);
+	if (!m_missingdata) //since this is a fallback menu for missing data, it is very hard to read with the box
+		M_DrawTextBox(0, 0, linelength, lines); //this is less obtrusive than hacking up the M_DrawTextBox function
+	for (i = 0, l = firstline;i < lines;i++, l++)
+		M_Print(8 + 4 * (linelength - strlen(m_quit_message[l])), 8 + 8 * i, m_quit_message[l]);
 }
 
 //=============================================================================
 /* LAN CONFIG MENU */
 
-int		lanConfig_cursor = -1;
-int		lanConfig_cursor_table [] = {72, 92, 112, 144};
+static int		lanConfig_cursor = -1;
+static int		lanConfig_cursor_table [] = {56, 76, 84, 120};
 #define NUM_LANCONFIG_CMDS	4
 
-int 	lanConfig_port;
-char	lanConfig_portname[6];
-char	lanConfig_joinname[22];
+static int 	lanConfig_port;
+static char	lanConfig_portname[6];
+static char	lanConfig_joinname[40];
 
 void M_Menu_LanConfig_f (void)
 {
@@ -2307,103 +3330,99 @@ void M_Menu_LanConfig_f (void)
 	m_entersound = true;
 	if (lanConfig_cursor == -1)
 	{
-		if (JoiningGame && TCPIPConfig)
-			lanConfig_cursor = 2;
-		else
+		if (JoiningGame)
 			lanConfig_cursor = 1;
 	}
-	if (StartingGame && lanConfig_cursor == 2)
+	if (StartingGame)
 		lanConfig_cursor = 1;
-	lanConfig_port = DEFAULTnet_hostport;
-	sprintf(lanConfig_portname, "%u", lanConfig_port);
+	lanConfig_port = 26000;
+	dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
 
-	m_return_onerror = false;
-	m_return_reason[0] = 0;
+	M_Update_Return_Reason("");
 }
 
 
-void M_LanConfig_Draw (void)
+static void M_LanConfig_Draw (void)
 {
 	cachepic_t	*p;
 	int		basex;
-	char	*startJoin;
-	char	*protocol;
+	const char	*startJoin;
+	const char	*protocol;
 
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/p_multi.lmp");
+	M_Background(320, 200);
+
+	M_DrawPic (16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/p_multi");
 	basex = (320-p->width)/2;
-	M_DrawPic (basex, 4, "gfx/p_multi.lmp");
+	M_DrawPic (basex, 4, "gfx/p_multi");
 
 	if (StartingGame)
 		startJoin = "New Game";
 	else
 		startJoin = "Join Game";
-	if (IPXConfig)
-		protocol = "IPX";
-	else
-		protocol = "TCP/IP";
-	M_Print (basex, 32, va ("%s - %s", startJoin, protocol));
+	protocol = "TCP/IP";
+	M_Print(basex, 32, va ("%s - %s", startJoin, protocol));
 	basex += 8;
 
-	M_Print (basex, 52, "Address:");
-	if (IPXConfig)
-		M_Print (basex+9*8, 52, my_ipx_address);
-	else
-		M_Print (basex+9*8, 52, my_tcpip_address);
-
-	M_Print (basex, lanConfig_cursor_table[0], "Port");
-	M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, 6, 1);
-	M_Print (basex+9*8, lanConfig_cursor_table[0], lanConfig_portname);
+	M_Print(basex, lanConfig_cursor_table[0], "Port");
+	M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, sizeof(lanConfig_portname), 1);
+	M_Print(basex+9*8, lanConfig_cursor_table[0], lanConfig_portname);
 
 	if (JoiningGame)
 	{
-		M_Print (basex, lanConfig_cursor_table[1], "Search for local games...");
-		M_Print (basex, lanConfig_cursor_table[2], "Search for internet games...");
-		M_Print (basex, 128, "Join game at:");
-		M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1);
-		M_Print (basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
+		M_Print(basex, lanConfig_cursor_table[1], "Search for DarkPlaces games...");
+		M_Print(basex, lanConfig_cursor_table[2], "Search for QuakeWorld games...");
+		M_Print(basex, lanConfig_cursor_table[3]-16, "Join game at:");
+		M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, sizeof(lanConfig_joinname), 1);
+		M_Print(basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
 	}
 	else
 	{
 		M_DrawTextBox (basex, lanConfig_cursor_table[1]-8, 2, 1);
-		M_Print (basex+8, lanConfig_cursor_table[1], "OK");
+		M_Print(basex+8, lanConfig_cursor_table[1], "OK");
 	}
 
 	M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(realtime*4)&1));
 
 	if (lanConfig_cursor == 0)
-		M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1));
+		M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(realtime*4)&1));
 
 	if (lanConfig_cursor == 3)
-		M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [3], 10+((int)(realtime*4)&1));
+		M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(realtime*4)&1));
 
 	if (*m_return_reason)
-		M_PrintWhite (basex, 168, m_return_reason);
+		M_Print(basex, 168, m_return_reason);
 }
 
 
-void M_LanConfig_Key (int key)
+static void M_LanConfig_Key (int key, int ascii)
 {
 	int		l;
 
 	switch (key)
 	{
 	case K_ESCAPE:
-		M_Menu_Net_f ();
+		M_Menu_MultiPlayer_f ();
 		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;
+		// when in start game menu, skip the unused search qw servers item
+		if (StartingGame && lanConfig_cursor == 2)
+			lanConfig_cursor = 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;
+		// when in start game menu, skip the unused search qw servers item
+		if (StartingGame && lanConfig_cursor == 1)
+			lanConfig_cursor = 2;
 		break;
 
 	case K_ENTER:
@@ -2412,7 +3431,9 @@ void M_LanConfig_Key (int key)
 
 		m_entersound = true;
 
-		M_ConfigureNetSubsystem ();
+		Cbuf_AddText ("stopdemo\n");
+
+		Cvar_SetValue("port", lanConfig_port);
 
 		if (lanConfig_cursor == 1 || lanConfig_cursor == 2)
 		{
@@ -2421,23 +3442,12 @@ void M_LanConfig_Key (int key)
 				M_Menu_GameOptions_f ();
 				break;
 			}
-			if (lanConfig_cursor == 1)
-				M_Menu_Search_f();
-			else
-				M_Menu_InetSearch_f();
+			M_Menu_ServerList_f();
 			break;
 		}
 
 		if (lanConfig_cursor == 3)
-		{
-			m_return_state = m_state;
-			m_return_onerror = true;
-			key_dest = key_game;
-			m_state = m_none;
 			Cbuf_AddText ( va ("connect \"%s\"\n", lanConfig_joinname) );
-			break;
-		}
-
 		break;
 
 	case K_BACKSPACE:
@@ -2455,28 +3465,28 @@ void M_LanConfig_Key (int key)
 		break;
 
 	default:
-		if (key < 32 || key > 127)
+		if (ascii < 32)
 			break;
 
 		if (lanConfig_cursor == 3)
 		{
-			l = strlen(lanConfig_joinname);
-			if (l < 21)
+			l = (int)strlen(lanConfig_joinname);
+			if (l < (int)sizeof(lanConfig_joinname) - 1)
 			{
 				lanConfig_joinname[l+1] = 0;
-				lanConfig_joinname[l] = key;
+				lanConfig_joinname[l] = ascii;
 			}
 		}
 
-		if (key < '0' || key > '9')
+		if (ascii < '0' || ascii > '9')
 			break;
 		if (lanConfig_cursor == 0)
 		{
-			l = strlen(lanConfig_portname);
-			if (l < 5)
+			l = (int)strlen(lanConfig_portname);
+			if (l < (int)sizeof(lanConfig_portname) - 1)
 			{
 				lanConfig_portname[l+1] = 0;
-				lanConfig_portname[l] = key;
+				lanConfig_portname[l] = ascii;
 			}
 		}
 	}
@@ -2490,39 +3500,37 @@ void M_LanConfig_Key (int key)
 	}
 
 	l =  atoi(lanConfig_portname);
-	if (l > 65535)
-		l = lanConfig_port;
-	else
+	if (l <= 65535)
 		lanConfig_port = l;
-	sprintf(lanConfig_portname, "%u", lanConfig_port);
+	dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
 }
 
 //=============================================================================
 /* GAME OPTIONS MENU */
 
-typedef struct
+typedef struct level_s
 {
-	char	*name;
-	char	*description;
+	const char	*name;
+	const char	*description;
 } level_t;
 
-typedef struct
+typedef struct episode_s
 {
-	char	*description;
+	const char	*description;
 	int		firstLevel;
 	int		levels;
 } episode_t;
 
-typedef struct
+typedef struct gamelevels_s
 {
-	char *gamename;
+	const char *gamename;
 	level_t *levels;
 	episode_t *episodes;
 	int numepisodes;
 }
 gamelevels_t;
 
-level_t quakelevels[] =
+static level_t quakelevels[] =
 {
 	{"start", "Entrance"},	// 0
 
@@ -2570,7 +3578,7 @@ level_t quakelevels[] =
 	{"dm6", "The Dark Zone"}
 };
 
-episode_t quakeepisodes[] =
+static episode_t quakeepisodes[] =
 {
 	{"Welcome to Quake", 0, 1},
 	{"Doomed Dimension", 1, 8},
@@ -2581,8 +3589,8 @@ episode_t quakeepisodes[] =
 	{"Deathmatch Arena", 32, 6}
 };
 
-//MED 01/06/97 added hipnotic levels
-level_t     hipnoticlevels[] =
+ //MED 01/06/97 added hipnotic levels
+static level_t     hipnoticlevels[] =
 {
    {"start", "Command HQ"},  // 0
 
@@ -2610,7 +3618,7 @@ level_t     hipnoticlevels[] =
 };
 
 //MED 01/06/97  added hipnotic episodes
-episode_t   hipnoticepisodes[] =
+static episode_t   hipnoticepisodes[] =
 {
    {"Scourge of Armagon", 0, 1},
    {"Fortress of the Dead", 1, 5},
@@ -2622,7 +3630,7 @@ episode_t   hipnoticepisodes[] =
 
 //PGM 01/07/97 added rogue levels
 //PGM 03/02/97 added dmatch level
-level_t		roguelevels[] =
+static level_t		roguelevels[] =
 {
 	{"start",	"Split Decision"},
 	{"r1m1",	"Deviant's Domain"},
@@ -2645,7 +3653,7 @@ level_t		roguelevels[] =
 
 //PGM 01/07/97 added rogue episodes
 //PGM 03/02/97 added dmatch episode
-episode_t	rogueepisodes[] =
+static episode_t	rogueepisodes[] =
 {
 	{"Introduction", 0, 1},
 	{"Hell's Fortress", 1, 7},
@@ -2653,7 +3661,7 @@ episode_t	rogueepisodes[] =
 	{"Deathmatch Arena", 16, 1}
 };
 
-level_t		nehahralevels[] =
+static level_t		nehahralevels[] =
 {
 	{"nehstart",	"Welcome to Nehahra"},
 	{"neh1m1",	"Forge City1: Slipgates"},
@@ -2676,7 +3684,7 @@ level_t		nehahralevels[] =
 	{"nehend",	"Quintessence"}
 };
 
-episode_t	nehahraepisodes[] =
+static episode_t	nehahraepisodes[] =
 {
 	{"Welcome to Nehahra", 0, 1},
 	{"The Fall of Forge", 1, 9},
@@ -2685,233 +3693,420 @@ episode_t	nehahraepisodes[] =
 };
 
 // Map list for Transfusion
-level_t		transfusionlevels[] =
+static 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)"},
+	{"b2bodies",	"BB_Bodies (B2)"},
+	{"b2cabana",	"BB_Cabana"},
+	{"b2power",		"BB_Power"},
 	{"barena",		"Blood Arena"},
 	{"bkeep",		"Blood Keep"},
 	{"bstar",		"Brown Star"},
 	{"crypt",		"The Crypt"},
 
 	{"bb3_2k1",		"Bodies Infusion"},
+	{"captasao",	"Captasao"},
+	{"curandero",	"Curandero"},
 	{"dcamp",		"DeathCamp"},
 	{"highnoon",	"HighNoon"},
 	{"qbb1",		"The Confluence"},
 	{"qbb2",		"KathartiK"},
 	{"qbb3",		"Caleb's Woodland Retreat"},
+	{"zoo",			"Zoo"},
 
 	{"dranzbb6",	"Black Coffee"},
 	{"fragm",		"Frag'M"},
 	{"maim",		"Maim"},
 	{"qe1m7",		"The House of Chthon"},
+	{"qdm1",		"Place of Two Deaths"},
+	{"qdm4",		"The Bad Place"},
+	{"qdm5",		"The Cistern"},
+	{"qmorbias",	"DM-Morbias"},
 	{"simple",		"Dead Simple"}
 };
 
-episode_t	transfusionepisodes[] =
+static episode_t	transfusionepisodes[] =
+{
+	{"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, 8},
+	{"Transfusion", 76, 9},
+	{"Conversions", 85, 9}
+};
+
+static level_t goodvsbad2levels[] =
+{
+	{"rts", "Many Paths"},  // 0
+	{"chess", "Chess, Scott Hess"},                         // 1
+	{"dot", "Big Wall"},
+	{"city2", "The Big City"},
+	{"bwall", "0 G like Psychic TV"},
+	{"snow", "Wireframed"},
+	{"telep", "Infinite Falling"},
+	{"faces", "Facing Bases"},
+	{"island", "Adventure Islands"},
+};
+
+static episode_t goodvsbad2episodes[] =
+{
+	{"Levels? Bevels!", 0, 8},
+};
+
+static level_t battlemechlevels[] =
+{
+	{"start", "Parking Level"},
+	{"dm1", "Hot Dump"},                        // 1
+	{"dm2", "The Pits"},
+	{"dm3", "Dimber Died"},
+	{"dm4", "Fire in the Hole"},
+	{"dm5", "Clubhouses"},
+	{"dm6", "Army go Underground"},
+};
+
+static episode_t battlemechepisodes[] =
+{
+	{"Time for Battle", 0, 7},
+};
+
+static 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"},
+};
+
+static episode_t openquartzepisodes[] =
+{
+	{"Single Player", 0, 1},
+	{"Void Deathmatch", 1, 6},
+	{"Contrib", 7, 6},
+};
+
+static level_t defeatindetail2levels[] =
+{
+	{"atac3",	"River Crossing"},
+	{"atac4",	"Canyon Chaos"},
+	{"atac7",	"Desert Stormer"},
+};
+
+static episode_t defeatindetail2episodes[] =
+{
+	{"ATAC Campaign", 0, 3},
+};
+
+static level_t prydonlevels[] =
 {
-	{"Blood", 0, 8},
-	{"Blood Single Player", 8, 7},
-	{"Plasma Pack", 15, 5},
-	{"Cryptic Passage", 20, 2},
-	{"Blood 2", 22, 5},
-	{"Transfusion", 27, 6},
-	{"Conversions", 33, 5}
+	{"curig2", "Capel Curig"},	// 0
+
+	{"tdastart", "Gateway"},				// 1
 };
 
-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};
+static episode_t prydonepisodes[] =
+{
+	{"Prydon Gate", 0, 1},
+	{"The Dark Age", 1, 1}
+};
 
-typedef struct
+static gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
+static gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
+static gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
+static gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
+static gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
+static gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
+static gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
+static gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
+static gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
+static gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
+static gamelevels_t prydongame = {"Prydon Gate", prydonlevels, prydonepisodes, 2};
+
+typedef struct gameinfo_s
 {
-	int gameid;
+	gamemode_t gameid;
 	gamelevels_t *notregistered;
 	gamelevels_t *registered;
 }
 gameinfo_t;
 
-gameinfo_t gamelist[] =
+static gameinfo_t gamelist[] =
 {
 	{GAME_NORMAL, &sharewarequakegame, &registeredquakegame},
 	{GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame},
 	{GAME_ROGUE, &roguegame, &roguegame},
 	{GAME_NEHAHRA, &nehahragame, &nehahragame},
 	{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
-	{-1, &sharewarequakegame, &registeredquakegame} // final fallback
+	{GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
+	{GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
+	{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
+	{GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
+	{GAME_PRYDON, &prydongame, &prydongame},
 };
 
-gamelevels_t *lookupgameinfo(void)
-{
-	int i;
-	for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++);
-	if (registered.integer)
-		return gamelist[i].registered;
-	else
-		return gamelist[i].notregistered;
-}
+static gamelevels_t *gameoptions_levels  = NULL;
 
-int	startepisode;
-int	startlevel;
-int maxplayers;
-qboolean m_serverInfoMessage = false;
-double m_serverInfoMessageTime;
+static int	startepisode;
+static int	startlevel;
+static int maxplayers;
+static qboolean m_serverInfoMessage = false;
+static double m_serverInfoMessageTime;
 
 void M_Menu_GameOptions_f (void)
 {
+	int i;
 	key_dest = key_menu;
 	m_state = m_gameoptions;
 	m_entersound = true;
 	if (maxplayers == 0)
 		maxplayers = svs.maxclients;
 	if (maxplayers < 2)
-		maxplayers = MAX_SCOREBOARD;
+		maxplayers = min(8, MAX_SCOREBOARD);
+	// pick game level list based on gamemode (use GAME_NORMAL if no matches)
+	gameoptions_levels = registered.integer ? gamelist[0].registered : gamelist[0].notregistered;
+	for (i = 0;i < (int)(sizeof(gamelist)/sizeof(gamelist[0]));i++)
+		if (gamelist[i].gameid == gamemode)
+			gameoptions_levels = registered.integer ? gamelist[i].registered : gamelist[i].notregistered;
 }
 
 
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 112, 120};
-#define	NUM_GAMEOPTIONS	9
-int		gameoptions_cursor;
+static int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
+#define	NUM_GAMEOPTIONS	12
+static int		gameoptions_cursor;
 
 void M_GameOptions_Draw (void)
 {
 	cachepic_t	*p;
 	int		x;
-	gamelevels_t *g;
 
-	M_DrawPic (16, 4, "gfx/qplaque.lmp");
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
+	M_Background(320, 200);
+
+	M_DrawPic (16, 4, "gfx/qplaque");
+	p = Draw_CachePic ("gfx/p_multi");
+	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 
 	M_DrawTextBox (152, 32, 10, 1);
-	M_Print (160, 40, "begin game");
+	M_Print(160, 40, "begin game");
 
-	M_Print (0, 56, "      Max players");
-	M_Print (160, 56, va("%i", maxplayers) );
+	M_Print(0, 56, "      Max players");
+	M_Print(160, 56, va("%i", maxplayers) );
 
-	M_Print (0, 64, "        Game Type");
-	if (gamemode == GAME_TRANSFUSION)
-	{
-		if (!deathmatch.integer)
-			Cvar_SetValue("deathmatch", 1);
-		if (deathmatch.integer == 2)
-			M_Print (160, 64, "Capture the Flag");
-		else
-			M_Print (160, 64, "Blood Bath");
-	}
-	else
+	if (gamemode != GAME_GOODVSBAD2)
 	{
-		if (!coop.integer && !deathmatch.integer)
-			Cvar_SetValue("deathmatch", 1);
-		if (coop.integer)
-			M_Print (160, 64, "Cooperative");
+		M_Print(0, 64, "        Game Type");
+		if (gamemode == GAME_TRANSFUSION)
+		{
+			if (!coop.integer && !deathmatch.integer)
+				Cvar_SetValue("deathmatch", 1);
+			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");
+		}
+		else if (gamemode == GAME_BATTLEMECH)
+		{
+			if (!deathmatch.integer)
+				Cvar_SetValue("deathmatch", 1);
+			if (deathmatch.integer == 2)
+				M_Print(160, 64, "Rambo Match");
+			else
+				M_Print(160, 64, "Deathmatch");
+		}
 		else
-			M_Print (160, 64, "Deathmatch");
-	}
-
-	M_Print (0, 72, "        Teamplay");
-	if (gamemode == GAME_ROGUE)
-	{
-		char *msg;
-
-		switch((int)teamplay.integer)
 		{
-			case 1: msg = "No Friendly Fire"; break;
-			case 2: msg = "Friendly Fire"; break;
-			case 3: msg = "Tag"; break;
-			case 4: msg = "Capture the Flag"; break;
-			case 5: msg = "One Flag CTF"; break;
-			case 6: msg = "Three Team CTF"; break;
-			default: msg = "Off"; break;
+			if (!coop.integer && !deathmatch.integer)
+				Cvar_SetValue("deathmatch", 1);
+			if (coop.integer)
+				M_Print(160, 64, "Cooperative");
+			else
+				M_Print(160, 64, "Deathmatch");
 		}
-		M_Print (160, 72, msg);
-	}
-	else if (gamemode == GAME_TRANSFUSION)
-	{
-		char *msg;
 
-		switch (teamplay.integer)
+		M_Print(0, 72, "        Teamplay");
+		if (gamemode == GAME_ROGUE)
 		{
-			case 0: msg = "Off"; break;
-			case 2: msg = "Friendly Fire"; break;
-			default: msg = "No Friendly Fire"; break;
+			const char *msg;
+
+			switch((int)teamplay.integer)
+			{
+				case 1: msg = "No Friendly Fire"; break;
+				case 2: msg = "Friendly Fire"; break;
+				case 3: msg = "Tag"; break;
+				case 4: msg = "Capture the Flag"; break;
+				case 5: msg = "One Flag CTF"; break;
+				case 6: msg = "Three Team CTF"; break;
+				default: msg = "Off"; break;
+			}
+			M_Print(160, 72, msg);
 		}
-		M_Print (160, 72, msg);
-	}
-	else
-	{
-		char *msg;
+		else
+		{
+			const char *msg;
 
-		switch((int)teamplay.integer)
+			switch (teamplay.integer)
+			{
+				case 0: msg = "Off"; break;
+				case 2: msg = "Friendly Fire"; break;
+				default: msg = "No Friendly Fire"; break;
+			}
+			M_Print(160, 72, msg);
+		}
+		M_Print(0, 80, "            Skill");
+		if (gamemode == GAME_TRANSFUSION)
 		{
-			case 1: msg = "No Friendly Fire"; break;
-			case 2: msg = "Friendly Fire"; break;
-			default: msg = "Off"; break;
+			if (skill.integer == 1)
+				M_Print(160, 80, "Still Kicking");
+			else if (skill.integer == 2)
+				M_Print(160, 80, "Pink On The Inside");
+			else if (skill.integer == 3)
+				M_Print(160, 80, "Lightly Broiled");
+			else if (skill.integer == 4)
+				M_Print(160, 80, "Well Done");
+			else
+				M_Print(160, 80, "Extra Crispy");
 		}
-		M_Print (160, 72, msg);
-	}
+		else
+		{
+			if (skill.integer == 0)
+				M_Print(160, 80, "Easy difficulty");
+			else if (skill.integer == 1)
+				M_Print(160, 80, "Normal difficulty");
+			else if (skill.integer == 2)
+				M_Print(160, 80, "Hard difficulty");
+			else
+				M_Print(160, 80, "Nightmare difficulty");
+		}
+		M_Print(0, 88, "       Frag Limit");
+		if (fraglimit.integer == 0)
+			M_Print(160, 88, "none");
+		else
+			M_Print(160, 88, va("%i frags", fraglimit.integer));
 
-	M_Print (0, 80, "            Skill");
-	if (skill.integer == 0)
-		M_Print (160, 80, "Easy difficulty");
-	else if (skill.integer == 1)
-		M_Print (160, 80, "Normal difficulty");
-	else if (skill.integer == 2)
-		M_Print (160, 80, "Hard difficulty");
-	else
-		M_Print (160, 80, "Nightmare difficulty");
+		M_Print(0, 96, "       Time Limit");
+		if (timelimit.integer == 0)
+			M_Print(160, 96, "none");
+		else
+			M_Print(160, 96, va("%i minutes", timelimit.integer));
+	}
 
-	M_Print (0, 88, "       Frag Limit");
-	if (fraglimit.integer == 0)
-		M_Print (160, 88, "none");
-	else
-		M_Print (160, 88, va("%i frags", fraglimit.integer));
+	M_Print(0, 104, "    Public server");
+	M_Print(160, 104, (sv_public.integer == 0) ? "no" : "yes");
 
-	M_Print (0, 96, "       Time Limit");
-	if (timelimit.integer == 0)
-		M_Print (160, 96, "none");
-	else
-		M_Print (160, 96, va("%i minutes", timelimit.integer));
+	M_Print(0, 112, "   Server maxrate");
+	M_Print(160, 112, va("%i", sv_maxrate.integer));
 
-	g = lookupgameinfo();
+	M_Print(0, 128, "      Server name");
+	M_DrawTextBox (0, 132, 38, 1);
+	M_Print(8, 140, hostname.string);
 
-	M_Print (0, 112, "         Episode");
-	M_Print (160, 112, g->episodes[startepisode].description);
+	if (gamemode != GAME_GOODVSBAD2)
+	{
+		M_Print(0, 160, "         Episode");
+		M_Print(160, 160, gameoptions_levels->episodes[startepisode].description);
+	}
 
-	M_Print (0, 120, "           Level");
-	M_Print (160, 120, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
-	M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+	M_Print(0, 168, "           Level");
+	M_Print(160, 168, gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].description);
+	M_Print(160, 176, gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name);
 
 // line cursor
-	M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
+	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));
 
 	if (m_serverInfoMessage)
 	{
@@ -2920,22 +4115,19 @@ void M_GameOptions_Draw (void)
 			x = (320-26*8)/2;
 			M_DrawTextBox (x, 138, 24, 4);
 			x += 8;
-			M_Print (x, 146, " More than 64 players?? ");
-			M_Print (x, 154, "  First, question your  ");
-			M_Print (x, 162, "   sanity, then email   ");
-			M_Print (x, 170, " havoc@telefragged.com  ");
+			M_Print(x, 146, " More than 255 players??");
+			M_Print(x, 154, "  First, question your  ");
+			M_Print(x, 162, "   sanity, then email   ");
+			M_Print(x, 170, " lordhavoc@ghdigital.com");
 		}
 		else
-		{
 			m_serverInfoMessage = false;
-		}
 	}
 }
 
 
-void M_NetStart_Change (int dir)
+static void M_NetStart_Change (int dir)
 {
-	gamelevels_t *g;
 	int count;
 
 	switch (gameoptions_cursor)
@@ -2953,11 +4145,36 @@ void M_NetStart_Change (int dir)
 		break;
 
 	case 2:
+		if (gamemode == GAME_GOODVSBAD2)
+			break;
 		if (gamemode == GAME_TRANSFUSION)
 		{
-			if (deathmatch.integer == 2) // changing from CTF to BloodBath
+			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)
+		{
+			if (deathmatch.integer == 2) // changing from Rambo to Deathmatch
 				Cvar_SetValueQuick (&deathmatch, 0);
-			else // changing from BloodBath to CTF
+			else // changing from Deathmatch to Rambo
 				Cvar_SetValueQuick (&deathmatch, 2);
 		}
 		else
@@ -2976,6 +4193,8 @@ void M_NetStart_Change (int dir)
 		break;
 
 	case 3:
+		if (gamemode == GAME_GOODVSBAD2)
+			break;
 		if (gamemode == GAME_ROGUE)
 			count = 6;
 		else
@@ -2989,14 +4208,28 @@ void M_NetStart_Change (int dir)
 		break;
 
 	case 4:
+		if (gamemode == GAME_GOODVSBAD2)
+			break;
 		Cvar_SetValueQuick (&skill, skill.integer + dir);
-		if (skill.integer > 3)
-			Cvar_SetValueQuick (&skill, 0);
-		if (skill.integer < 0)
-			Cvar_SetValueQuick (&skill, 3);
+		if (gamemode == GAME_TRANSFUSION)
+		{
+			if (skill.integer > 5)
+				Cvar_SetValueQuick (&skill, 1);
+			if (skill.integer < 1)
+				Cvar_SetValueQuick (&skill, 5);
+		}
+		else
+		{
+			if (skill.integer > 3)
+				Cvar_SetValueQuick (&skill, 0);
+			if (skill.integer < 0)
+				Cvar_SetValueQuick (&skill, 3);
+		}
 		break;
 
 	case 5:
+		if (gamemode == GAME_GOODVSBAD2)
+			break;
 		Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10);
 		if (fraglimit.integer > 100)
 			Cvar_SetValueQuick (&fraglimit, 0);
@@ -3005,6 +4238,8 @@ void M_NetStart_Change (int dir)
 		break;
 
 	case 6:
+		if (gamemode == GAME_GOODVSBAD2)
+			break;
 		Cvar_SetValueQuick (&timelimit, timelimit.value + dir*5);
 		if (timelimit.value > 60)
 			Cvar_SetValueQuick (&timelimit, 0);
@@ -3013,50 +4248,64 @@ void M_NetStart_Change (int dir)
 		break;
 
 	case 7:
+		Cvar_SetValueQuick (&sv_public, !sv_public.integer);
+		break;
+
+	case 8:
+		Cvar_SetValueQuick (&sv_maxrate, sv_maxrate.integer + dir*500);
+		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;
-		g = lookupgameinfo();
 
 		if (startepisode < 0)
-			startepisode = g->numepisodes - 1;
+			startepisode = gameoptions_levels->numepisodes - 1;
 
-		if (startepisode >= g->numepisodes)
+		if (startepisode >= gameoptions_levels->numepisodes)
 			startepisode = 0;
 
 		startlevel = 0;
 		break;
 
-	case 8:
+	case 11:
 		startlevel += dir;
-		g = lookupgameinfo();
 
 		if (startlevel < 0)
-			startlevel = g->episodes[startepisode].levels - 1;
+			startlevel = gameoptions_levels->episodes[startepisode].levels - 1;
 
-		if (startlevel >= g->episodes[startepisode].levels)
+		if (startlevel >= gameoptions_levels->episodes[startepisode].levels)
 			startlevel = 0;
 		break;
 	}
 }
 
-void M_GameOptions_Key (int key)
+static void M_GameOptions_Key (int key, int ascii)
 {
-	gamelevels_t *g;
+	int l;
+	char hostnamebuf[128];
 
 	switch (key)
 	{
 	case K_ESCAPE:
-		M_Menu_Net_f ();
+		M_Menu_MultiPlayer_f ();
 		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;
@@ -3065,222 +4314,390 @@ void M_GameOptions_Key (int key)
 	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)
 				Cbuf_AddText ("disconnect\n");
-			Cbuf_AddText ("listen 0\n");	// so host_netport will be re-examined
 			Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
 
-			g = lookupgameinfo();
-			Cbuf_AddText ( va ("map %s\n", g->levels[g->episodes[startepisode].firstLevel + startlevel].name) );
+			Cbuf_AddText ( va ("map %s\n", gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name) );
 			return;
 		}
 
 		M_NetStart_Change (1);
 		break;
+
+	case K_BACKSPACE:
+		if (gameoptions_cursor == 9)
+		{
+			l = (int)strlen(hostname.string);
+			if (l)
+			{
+				l = min(l - 1, 37);
+				memcpy(hostnamebuf, hostname.string, l);
+				hostnamebuf[l] = 0;
+				Cvar_Set("hostname", hostnamebuf);
+			}
+		}
+		break;
+
+	default:
+		if (ascii < 32)
+			break;
+		if (gameoptions_cursor == 9)
+		{
+			l = (int)strlen(hostname.string);
+			if (l < 37)
+			{
+				memcpy(hostnamebuf, hostname.string, l);
+				hostnamebuf[l] = ascii;
+				hostnamebuf[l+1] = 0;
+				Cvar_Set("hostname", hostnamebuf);
+			}
+		}
 	}
 }
 
 //=============================================================================
-/* SEARCH MENU */
+/* SLIST MENU */
 
-qboolean	searchComplete = false;
-double		searchCompleteTime;
+static int slist_cursor;
 
-void M_Menu_Search_f (void)
+void M_Menu_ServerList_f (void)
 {
 	key_dest = key_menu;
-	m_state = m_search;
-	m_entersound = false;
-	slistSilent = true;
-	slistLocal = false;
-	searchComplete = false;
-	NET_Slist_f();
-
+	m_state = m_slist;
+	m_entersound = true;
+	slist_cursor = 0;
+	M_Update_Return_Reason("");
+	if (lanConfig_cursor == 2)
+		Net_SlistQW_f();
+	else
+		Net_Slist_f();
 }
 
 
-void M_Search_Draw (void)
+static void M_ServerList_Draw (void)
 {
-	const char* string;
-	cachepic_t	*p;
-	int x;
-
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
-	x = (320/2) - ((12*8)/2) + 4;
-	M_DrawTextBox (x-8, 32, 12, 1);
-	M_Print (x, 40, "Searching...");
+	int n, y, visible, start, end, numplayers, maxplayers;
+	cachepic_t *p;
+	const char *s;
 
-	if(slistInProgress)
+	// use as much vertical space as available
+	if (gamemode == GAME_TRANSFUSION)
+		M_Background(640, vid_conheight.integer - 80);
+	else
+		M_Background(640, vid_conheight.integer);
+	// scroll the list as the cursor moves
+	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);
+	y = 48;
+	visible = (int)((menu_height - 16 - y) / 8 / 2);
+	start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
+	end = min(start + visible, serverlist_viewcount);
+
+	p = Draw_CachePic ("gfx/p_multi");
+	M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
+	if (end > start)
 	{
-		NET_Poll();
-		return;
+		for (n = start;n < end;n++)
+		{
+			serverlist_entry_t *entry = ServerList_GetViewEntry(n);
+			DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+			M_PrintColored(0, y, entry->line1);y += 8;
+			M_PrintColored(0, y, entry->line2);y += 8;
+		}
 	}
-
-	if (! searchComplete)
+	else if (realtime - masterquerytime > 10)
 	{
-		searchComplete = true;
-		searchCompleteTime = realtime;
+		if (masterquerycount)
+			M_Print(0, y, "No servers found");
+		else
+			M_Print(0, y, "No master servers found (network problem?)");
 	}
-
-	if (hostCacheCount)
+	else
 	{
-		M_Menu_ServerList_f ();
-		return;
+		if (serverquerycount)
+			M_Print(0, y, "Querying servers");
+		else
+			M_Print(0, y, "Querying master servers");
 	}
-
-	if (gamemode == GAME_TRANSFUSION)
-		string = "No Transfusion servers found";
-	else
-		string = "No Quake servers found";
-	M_PrintWhite ((320/2) - ((22*8)/2), 64, string);
-	if ((realtime - searchCompleteTime) < 3.0)
-		return;
-
-	M_Menu_LanConfig_f ();
 }
 
 
-void M_Search_Key (int key)
+static void M_ServerList_Key(int k, int ascii)
 {
+	switch (k)
+	{
+	case K_ESCAPE:
+		M_Menu_LanConfig_f();
+		break;
+
+	case K_SPACE:
+		if (lanConfig_cursor == 2)
+			Net_SlistQW_f();
+		else
+			Net_Slist_f();
+		break;
+
+	case K_UPARROW:
+	case K_LEFTARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		slist_cursor--;
+		if (slist_cursor < 0)
+			slist_cursor = serverlist_viewcount - 1;
+		break;
+
+	case K_DOWNARROW:
+	case K_RIGHTARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		slist_cursor++;
+		if (slist_cursor >= serverlist_viewcount)
+			slist_cursor = 0;
+		break;
+
+	case K_ENTER:
+		S_LocalSound ("sound/misc/menu2.wav");
+		if (serverlist_viewcount)
+			Cbuf_AddText(va("connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname));
+		break;
+
+	default:
+		break;
+	}
+
 }
 
 //=============================================================================
-/* INTERNET SEARCH MENU */
+/* MODLIST MENU */
+// same limit of mod dirs as in fs.c
+#define MODLIST_MAXDIRS 16
+static int modlist_enabled [MODLIST_MAXDIRS];	//array of indexs to modlist
+static int modlist_numenabled;			//number of enabled (or in process to be..) mods
 
-void M_Menu_InetSearch_f (void)
+typedef struct modlist_entry_s
 {
-	key_dest = key_menu;
-	m_state = m_search;
-	m_entersound = false;
-	slistSilent = true;
-	slistLocal = false;
-	searchComplete = false;
-	NET_InetSlist_f();
+	qboolean loaded;	// used to determine whether this entry is loaded and running
+	int enabled;		// index to array of modlist_enabled
 
-}
+	// name of the modification, this is (will...be) displayed on the menu entry
+	char name[128];
+	// directory where we will find it
+	char dir[MAX_QPATH];
+} modlist_entry_t;
+
+static int modlist_cursor;
+//static int modlist_viewcount;
 
+static int modlist_count = 0;
+static modlist_entry_t modlist[MODLIST_TOTALSIZE];
 
-void M_InetSearch_Draw (void)
+void ModList_RebuildList(void)
 {
-	M_Search_Draw ();  // it's the same one, so why bother?
+	int i,j;
+	stringlist_t list;
+
+	stringlistinit(&list);
+	listdirectory(&list, fs_basedir, "");
+	stringlistsort(&list);
+	modlist_count = 0;
+	modlist_numenabled = fs_numgamedirs;
+	for (i = 0;i < list.numstrings;i++)
+	{
+		if (modlist_count >= MODLIST_TOTALSIZE)	break;
+		// check all dirs to see if they "appear" to be mods
+		// reject any dirs that are part of the base game
+		if (gamedirname1 && !strcasecmp(gamedirname1, list.strings[i])) continue;
+		//if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue;
+		if (FS_CheckNastyPath (list.strings[i], true)) continue;
+		if (!FS_CheckGameDir(list.strings[i])) continue;
+
+		strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir));
+		//check currently loaded mods
+		modlist[modlist_count].loaded = false;
+		if (fs_numgamedirs)
+			for (j = 0; j < fs_numgamedirs; j++)
+				if (!strcasecmp(fs_gamedirs[j], modlist[modlist_count].dir))
+				{
+					modlist[modlist_count].loaded = true;
+					modlist[modlist_count].enabled = j;
+					modlist_enabled[j] = modlist_count;
+					break;
+				}
+		modlist_count ++;
+	}
+	stringlistfreecontents(&list);
 }
 
-
-void M_InetSearch_Key (int key)
+void ModList_Enable (void)
 {
-}
+	int i;
+	int numgamedirs;
+	char gamedirs[MODLIST_MAXDIRS][MAX_QPATH];
 
-//=============================================================================
-/* SLIST MENU */
+	// copy our mod list into an array for FS_ChangeGameDirs
+	numgamedirs = modlist_numenabled;
+	for (i = 0; i < modlist_numenabled; i++)
+		strlcpy (gamedirs[i], modlist[modlist_enabled[i]].dir,sizeof (gamedirs[i]));
 
-int		slist_cursor;
-qboolean slist_sorted;
+	// this code snippet is from FS_ChangeGameDirs
+	if (fs_numgamedirs == numgamedirs)
+	{
+		for (i = 0;i < numgamedirs;i++)
+			if (strcasecmp(fs_gamedirs[i], gamedirs[i]))
+				break;
+		if (i == numgamedirs)
+			return; // already using this set of gamedirs, do nothing
+	}
 
-void M_Menu_ServerList_f (void)
+	// this part is basically the same as the FS_GameDir_f function
+	if ((cls.state == ca_connected && !cls.demoplayback) || sv.active)
+	{
+		// actually, changing during game would work fine, but would be stupid
+		Con_Printf("Can not change gamedir while client is connected or server is running!\n");
+		return;
+	}
+
+	FS_ChangeGameDirs (modlist_numenabled, gamedirs, true, true);
+}
+
+void M_Menu_ModList_f (void)
 {
 	key_dest = key_menu;
-	m_state = m_slist;
+	m_state = m_modlist;
 	m_entersound = true;
-	slist_cursor = 0;
-	m_return_onerror = false;
-	m_return_reason[0] = 0;
-	slist_sorted = false;
+	modlist_cursor = 0;
+	M_Update_Return_Reason("");
+	ModList_RebuildList();
 }
 
-
-void M_ServerList_Draw (void)
+static void M_Menu_ModList_AdjustSliders (int dir)
 {
-	int		n;
-	char	string [64];
-	cachepic_t	*p;
+	int i;
+	S_LocalSound ("sound/misc/menu3.wav");
 
-	if (!slist_sorted)
+	// stop adding mods, we reach the limit
+	if (!modlist[modlist_cursor].loaded && (modlist_numenabled == MODLIST_MAXDIRS)) return;
+	modlist[modlist_cursor].loaded = !modlist[modlist_cursor].loaded;
+	if (modlist[modlist_cursor].loaded)
 	{
-		if (hostCacheCount > 1)
+		modlist[modlist_cursor].enabled = modlist_numenabled;
+		//push the value on the enabled list
+		modlist_enabled[modlist_numenabled++] = modlist_cursor;
+	}
+	else
+	{
+		//eliminate the value from the enabled list
+		for (i = modlist[modlist_cursor].enabled; i < modlist_numenabled; i++)
 		{
-			int	i,j;
-			hostcache_t temp;
-			for (i = 0; i < hostCacheCount; i++)
-				for (j = i+1; j < hostCacheCount; j++)
-					if (strcmp(hostcache[j].name, hostcache[i].name) < 0)
-					{
-						memcpy(&temp, &hostcache[j], sizeof(hostcache_t));
-						memcpy(&hostcache[j], &hostcache[i], sizeof(hostcache_t));
-						memcpy(&hostcache[i], &temp, sizeof(hostcache_t));
-					}
+			modlist_enabled[i] = modlist_enabled[i+1];
+			modlist[modlist_enabled[i]].enabled--;
 		}
-		slist_sorted = true;
+		modlist_numenabled--;
 	}
+}
 
-	p = Draw_CachePic ("gfx/p_multi.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
-	for (n = 0; n < hostCacheCount; n++)
-	{
-		if (hostcache[n].maxusers)
-			sprintf(string, "%-15.15s %-15.15s %2u/%2u\n", hostcache[n].name, hostcache[n].map, hostcache[n].users, hostcache[n].maxusers);
-		else
-			sprintf(string, "%-15.15s %-15.15s\n", hostcache[n].name, hostcache[n].map);
-		M_Print (16, 32 + 8*n, string);
-	}
-	M_DrawCharacter (0, 32 + slist_cursor*8, 12+((int)(realtime*4)&1));
+static void M_ModList_Draw (void)
+{
+	int n, y, visible, start, end;
+	cachepic_t *p;
+	const char *s_available = "Available Mods";
+	const char *s_enabled = "Enabled Mods";
+
+	// use as much vertical space as available
+	if (gamemode == GAME_TRANSFUSION)
+		M_Background(640, vid_conheight.integer - 80);
+	else
+		M_Background(640, vid_conheight.integer);
+
+	M_PrintRed(48 + 32, 32, s_available);
+	M_PrintRed(432, 32, s_enabled);
+	// Draw a list box with all enabled mods
+	DrawQ_Pic(menu_x + 432, menu_y + 48, NULL, 172, 8 * modlist_numenabled, 0, 0, 0, 0.5, 0);
+	for (y = 0; y < modlist_numenabled; y++)
+		M_PrintRed(432, 48 + y * 8, modlist[modlist_enabled[y]].dir);
 
 	if (*m_return_reason)
-		M_PrintWhite (16, 168, m_return_reason);
+		M_Print(16, menu_height - 8, m_return_reason);
+	// scroll the list as the cursor moves
+	y = 48;
+	visible = (int)((menu_height - 16 - y) / 8 / 2);
+	start = bound(0, modlist_cursor - (visible >> 1), modlist_count - visible);
+	end = min(start + visible, modlist_count);
+
+	p = Draw_CachePic ("gfx/p_option");
+	M_DrawPic((640 - p->width) / 2, 4, "gfx/p_option");
+	if (end > start)
+	{
+		for (n = start;n < end;n++)
+		{
+			DrawQ_Pic(menu_x + 40, menu_y + y, NULL, 360, 8, n == modlist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+			M_ItemPrint(80, y, modlist[n].dir, true);
+			M_DrawCheckbox(48, y, modlist[n].loaded);
+			y +=8;
+		}
+	}
+	else
+	{
+		M_Print(80, y, "No Mods found");
+	}
 }
 
-
-void M_ServerList_Key (int k)
+static void M_ModList_Key(int k, int ascii)
 {
 	switch (k)
 	{
 	case K_ESCAPE:
-		M_Menu_LanConfig_f ();
+		ModList_Enable ();
+		M_Menu_Options_f();
 		break;
 
 	case K_SPACE:
-		M_Menu_Search_f ();
+		S_LocalSound ("sound/misc/menu2.wav");
+		ModList_RebuildList();
 		break;
 
 	case K_UPARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		modlist_cursor--;
+		if (modlist_cursor < 0)
+			modlist_cursor = modlist_count - 1;
+		break;
+
 	case K_LEFTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		slist_cursor--;
-		if (slist_cursor < 0)
-			slist_cursor = hostCacheCount - 1;
+		M_Menu_ModList_AdjustSliders (-1);
 		break;
 
 	case K_DOWNARROW:
+		S_LocalSound ("sound/misc/menu1.wav");
+		modlist_cursor++;
+		if (modlist_cursor >= modlist_count)
+			modlist_cursor = 0;
+		break;
+
 	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		slist_cursor++;
-		if (slist_cursor >= hostCacheCount)
-			slist_cursor = 0;
+		M_Menu_ModList_AdjustSliders (1);
 		break;
 
 	case K_ENTER:
-		S_LocalSound ("misc/menu2.wav");
-		m_return_state = m_state;
-		m_return_onerror = true;
-		slist_sorted = false;
-		key_dest = key_game;
-		m_state = m_none;
-		Cbuf_AddText ( va ("connect \"%s\"\n", hostcache[slist_cursor].cname) );
+		S_LocalSound ("sound/misc/menu2.wav");
+		ModList_Enable ();
 		break;
 
 	default:
@@ -3292,72 +4709,44 @@ void M_ServerList_Key (int k)
 //=============================================================================
 /* Menu Subsystem */
 
+static void M_KeyEvent(int key, int ascii, qboolean downevent);
+static void M_Draw(void);
+void M_ToggleMenu(int mode);
+static void M_Shutdown(void);
 
 void M_Init (void)
 {
-	Cmd_AddCommand ("togglemenu", M_ToggleMenu_f);
-
-	Cmd_AddCommand ("menu_main", M_Menu_Main_f);
-	Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f);
-	Cmd_AddCommand ("menu_load", M_Menu_Load_f);
-	Cmd_AddCommand ("menu_save", M_Menu_Save_f);
-	Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f);
-	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_keys", M_Menu_Keys_f);
-	Cmd_AddCommand ("menu_video", M_Menu_Video_f);
-	Cmd_AddCommand ("help", M_Menu_Help_f);
-	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
-
-	if (gamemode == GAME_TRANSFUSION)
-	{
-		numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
-		bindnames = transfusionbindnames;
-	}
-	else
-	{
-		numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
-		bindnames = quakebindnames;
-	}
-
-	if (gamemode == GAME_NEHAHRA)
-	{
-		if (COM_FileExists("maps/neh1m4.bsp"))
-		{
-			if (COM_FileExists("hearing.dem"))
-			{
-				Con_Printf("Nehahra movie and game detected.\n");
-				NehGameType = TYPE_BOTH;
-			}
-			else
-			{
-				Con_Printf("Nehahra game detected.\n");
-				NehGameType = TYPE_GAME;
-			}
-		}
-		else
-		{
-			if (COM_FileExists("hearing.dem"))
-			{
-				Con_Printf("Nehahra movie detected.\n");
-				NehGameType = TYPE_DEMO;
-			}
-			else
-			{
-				Con_Printf("Nehahra not found.\n");
-				NehGameType = TYPE_GAME; // could just complain, but...
-			}
-		}
-	}
+	menuplyr_load = true;
+	menuplyr_pixels = NULL;
+
+	Cmd_AddCommand ("menu_main", M_Menu_Main_f, "open the main menu");
+	Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f, "open the singleplayer menu");
+	Cmd_AddCommand ("menu_load", M_Menu_Load_f, "open the loadgame menu");
+	Cmd_AddCommand ("menu_save", M_Menu_Save_f, "open the savegame menu");
+	Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f, "open the multiplayer menu");
+	Cmd_AddCommand ("menu_setup", M_Menu_Setup_f, "open the player setup menu");
+	Cmd_AddCommand ("menu_options", M_Menu_Options_f, "open the options menu");
+	Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f, "open the effects options menu");
+	Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f, "open the graphics options menu");
+	Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f, "open the color control menu");
+	Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "open the key binding menu");
+	Cmd_AddCommand ("menu_video", M_Menu_Video_f, "open the video options menu");
+	Cmd_AddCommand ("menu_reset", M_Menu_Reset_f, "open the reset to defaults menu");
+	Cmd_AddCommand ("menu_mods", M_Menu_ModList_f, "open the mods browser menu");
+	Cmd_AddCommand ("help", M_Menu_Help_f, "open the help menu");
+	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "open the quit menu");
+	Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu");
+	Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu");
+	Cmd_AddCommand ("menu_credits", M_Menu_Credits_f, "open the credits menu");
 }
 
 void M_Draw (void)
 {
-	if (m_state == m_none || key_dest != key_menu)
-		return;
+	if (key_dest != key_menu && key_dest != key_menu_grabbed)
+		m_state = m_none;
 
-	M_DrawBackground();
+	if (m_state == m_none)
+		return;
 
 	switch (m_state)
 	{
@@ -3376,6 +4765,14 @@ void M_Draw (void)
 		M_SinglePlayer_Draw ();
 		break;
 
+	case m_transfusion_episode:
+		M_Transfusion_Episode_Draw ();
+		break;
+
+	case m_transfusion_skill:
+		M_Transfusion_Skill_Draw ();
+		break;
+
 	case m_load:
 		M_Load_Draw ();
 		break;
@@ -3392,10 +4789,6 @@ void M_Draw (void)
 		M_Setup_Draw ();
 		break;
 
-	case m_net:
-		M_Net_Draw ();
-		break;
-
 	case m_options:
 		M_Options_Draw ();
 		break;
@@ -3404,10 +4797,22 @@ 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;
+
 	case m_keys:
 		M_Keys_Draw ();
 		break;
 
+	case m_reset:
+		M_Reset_Draw ();
+		break;
+
 	case m_video:
 		M_Video_Draw ();
 		break;
@@ -3416,6 +4821,10 @@ void M_Draw (void)
 		M_Help_Draw ();
 		break;
 
+	case m_credits:
+		M_Credits_Draw ();
+		break;
+
 	case m_quit:
 		M_Quit_Draw ();
 		break;
@@ -3428,18 +4837,50 @@ void M_Draw (void)
 		M_GameOptions_Draw ();
 		break;
 
-	case m_search:
-		M_Search_Draw ();
-		break;
-
 	case m_slist:
 		M_ServerList_Draw ();
 		break;
+
+	case m_modlist:
+		M_ModList_Draw ();
+		break;
+	}
+
+	if (gamemode == GAME_TRANSFUSION && !m_missingdata) {
+		if (m_state != m_credits) {
+			cachepic_t	*p, *drop1, *drop2, *drop3;
+			int g, scale_x, scale_y, scale_y_repeat, top_offset;
+			float scale_y_rate;
+			scale_y_repeat = vid_conheight.integer * 2;
+			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));
+			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);
+					DrawQ_Pic (scale_x +  116, scale_y_repeat + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 180, scale_y_repeat * .275 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 242, scale_y_repeat * .75 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 304, scale_y_repeat * .25 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 362, scale_y_repeat * .46125 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 402, scale_y_repeat * .1725 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 438, scale_y_repeat * .9 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0);
+					DrawQ_Pic (scale_x + 484, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
+					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)), 0, 0, 1, 1, 1, 1, 0);
+			}
+		}
 	}
 
 	if (m_entersound)
 	{
-		S_LocalSound ("misc/menu2.wav");
+		S_LocalSound ("sound/misc/menu2.wav");
 		m_entersound = false;
 	}
 
@@ -3447,95 +4888,481 @@ void M_Draw (void)
 }
 
 
-void M_Keydown (int key)
+void M_KeyEvent (int key, int ascii, qboolean downevent)
 {
+	if (!downevent)
+		return;
 	switch (m_state)
 	{
 	case m_none:
 		return;
 
 	case m_main:
-		M_Main_Key (key);
+		M_Main_Key (key, ascii);
 		return;
 
 	case m_demo:
-		M_Demo_Key (key);
+		M_Demo_Key (key, ascii);
 		return;
 
 	case m_singleplayer:
-		M_SinglePlayer_Key (key);
+		M_SinglePlayer_Key (key, ascii);
+		return;
+
+	case m_transfusion_episode:
+		M_Transfusion_Episode_Key (key, ascii);
+		return;
+
+	case m_transfusion_skill:
+		M_Transfusion_Skill_Key (key, ascii);
 		return;
 
 	case m_load:
-		M_Load_Key (key);
+		M_Load_Key (key, ascii);
 		return;
 
 	case m_save:
-		M_Save_Key (key);
+		M_Save_Key (key, ascii);
 		return;
 
 	case m_multiplayer:
-		M_MultiPlayer_Key (key);
+		M_MultiPlayer_Key (key, ascii);
 		return;
 
 	case m_setup:
-		M_Setup_Key (key);
-		return;
-
-	case m_net:
-		M_Net_Key (key);
+		M_Setup_Key (key, ascii);
 		return;
 
 	case m_options:
-		M_Options_Key (key);
+		M_Options_Key (key, ascii);
 		return;
 
 	case m_options_effects:
-		M_Options_Effects_Key (key);
+		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;
 
 	case m_keys:
-		M_Keys_Key (key);
+		M_Keys_Key (key, ascii);
+		return;
+
+	case m_reset:
+		M_Reset_Key (key, ascii);
 		return;
 
 	case m_video:
-		M_Video_Key (key);
+		M_Video_Key (key, ascii);
 		return;
 
 	case m_help:
-		M_Help_Key (key);
+		M_Help_Key (key, ascii);
+		return;
+
+	case m_credits:
+		M_Credits_Key (key, ascii);
 		return;
 
 	case m_quit:
-		M_Quit_Key (key);
+		M_Quit_Key (key, ascii);
 		return;
 
 	case m_lanconfig:
-		M_LanConfig_Key (key);
+		M_LanConfig_Key (key, ascii);
 		return;
 
 	case m_gameoptions:
-		M_GameOptions_Key (key);
+		M_GameOptions_Key (key, ascii);
 		return;
 
-	case m_search:
-		M_Search_Key (key);
-		break;
-
 	case m_slist:
-		M_ServerList_Key (key);
+		M_ServerList_Key (key, ascii);
+		return;
+
+	case m_modlist:
+		M_ModList_Key (key, ascii);
 		return;
 	}
+
+}
+
+void M_NewMap(void)
+{
+}
+
+void M_Shutdown(void)
+{
+	// reset key_dest
+	key_dest = key_game;
+}
+
+//============================================================================
+// Menu prog handling
+
+static const char *m_required_func[] = {
+"m_init",
+"m_keydown",
+"m_draw",
+"m_toggle",
+"m_shutdown",
+};
+
+static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
+
+void MR_SetRouting (qboolean forceold);
+
+void MP_Error(const char *format, ...) DP_FUNC_PRINTF(1);
+void MP_Error(const char *format, ...)
+{
+	static qboolean processingError = false;
+	char errorstring[MAX_INPUTLINE];
+	va_list argptr;
+
+	va_start (argptr, format);
+	dpvsnprintf (errorstring, sizeof(errorstring), format, argptr);
+	va_end (argptr);
+	Con_Printf( "Menu_Error: %s\n", errorstring );
+
+	if( !processingError ) {
+		processingError = true;
+		PRVM_Crash();
+		processingError = false;
+	} else {
+		Con_Printf( "Menu_Error: Recursive call to MP_Error (from PRVM_Crash)!\n" );
+	}
+
+	// fall back to the normal menu
+
+	// say it
+	Con_Print("Falling back to normal menu\n");
+
+	key_dest = key_game;
+
+	// 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();
+}
+
+void MP_KeyEvent (int key, int ascii, qboolean downevent)
+{
+	PRVM_Begin;
+	PRVM_SetProg(PRVM_MENUPROG);
+
+	// pass key
+	prog->globals.generic[OFS_PARM0] = (float) key;
+	prog->globals.generic[OFS_PARM1] = (float) ascii;
+	if (downevent)
+		PRVM_ExecuteProgram(prog->funcoffsets.m_keydown,"m_keydown(float key, float ascii) required");
+	else if (prog->funcoffsets.m_keyup)
+		PRVM_ExecuteProgram(prog->funcoffsets.m_keyup,"m_keyup(float key, float ascii) required");
+
+	PRVM_End;
 }
 
+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;
 
-void M_ConfigureNetSubsystem(void)
+	// 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(int mode)
 {
-// enable/disable net systems to match desired config
+	PRVM_Begin;
+	PRVM_SetProg(PRVM_MENUPROG);
 
-	Cbuf_AddText ("stopdemo\n");
+	prog->globals.generic[OFS_PARM0] = (float) mode;
+	PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
 
-	if (IPXConfig || TCPIPConfig)
-		net_hostport = lanConfig_port;
+	PRVM_End;
 }
 
+void MP_NewMap(void)
+{
+	PRVM_Begin;
+	PRVM_SetProg(PRVM_MENUPROG);
+	if (prog->funcoffsets.m_newmap)
+		PRVM_ExecuteProgram(prog->funcoffsets.m_newmap,"m_newmap() required");
+	PRVM_End;
+}
+
+void MP_Shutdown (void)
+{
+	PRVM_Begin;
+	PRVM_SetProg(PRVM_MENUPROG);
+
+	PRVM_ExecuteProgram(prog->funcoffsets.m_shutdown,"m_shutdown() required");
+
+	// reset key_dest
+	key_dest = key_game;
+
+	// AK not using this cause Im not sure whether this is useful at all instead :
+	PRVM_ResetProg();
+
+	PRVM_End;
+}
+
+void MP_Init (void)
+{
+	PRVM_Begin;
+	PRVM_InitProg(PRVM_MENUPROG);
+
+	prog->headercrc = M_PROGHEADER_CRC;
+	prog->edictprivate_size = 0; // no private struct used
+	prog->name = M_NAME;
+	prog->num_edicts = 1;
+	prog->limit_edicts = M_MAX_EDICTS;
+	prog->extensionstring = vm_m_extensions;
+	prog->builtins = vm_m_builtins;
+	prog->numbuiltins = vm_m_numbuiltins;
+	prog->init_cmd = VM_M_Cmd_Init;
+	prog->reset_cmd = VM_M_Cmd_Reset;
+	prog->error_cmd = MP_Error;
+	prog->ExecuteProgram = MVM_ExecuteProgram;
+
+	// allocate the mempools
+	prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
+
+	PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL, 0, NULL);
+
+	// note: OP_STATE is not supported by menu qc, we don't even try to detect
+	// it here
+
+	in_client_mouse = true;
+
+	// call the prog init
+	PRVM_ExecuteProgram(prog->funcoffsets.m_init,"m_init() required");
+
+	PRVM_End;
+}
+
+//============================================================================
+// Menu router
+
+void (*MR_KeyEvent) (int key, int ascii, qboolean downevent);
+void (*MR_Draw) (void);
+void (*MR_ToggleMenu) (int mode);
+void (*MR_Shutdown) (void);
+void (*MR_NewMap) (void);
+
+void MR_SetRouting(qboolean forceold)
+{
+	// if the menu prog isnt available or forceqmenu ist set, use the old menu
+	if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold)
+	{
+		// set menu router function pointers
+		MR_KeyEvent = M_KeyEvent;
+		MR_Draw = M_Draw;
+		MR_ToggleMenu = M_ToggleMenu;
+		MR_Shutdown = M_Shutdown;
+		MR_NewMap = M_NewMap;
+		M_Init();
+	}
+	else
+	{
+		// set menu router function pointers
+		MR_KeyEvent = MP_KeyEvent;
+		MR_Draw = MP_Draw;
+		MR_ToggleMenu = MP_ToggleMenu;
+		MR_Shutdown = MP_Shutdown;
+		MR_NewMap = MP_NewMap;
+		MP_Init();
+	}
+}
+
+void MR_Restart(void)
+{
+	MR_Shutdown ();
+	MR_SetRouting (FALSE);
+}
+
+void Call_MR_ToggleMenu_f(void)
+{
+	int m;
+	m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1)));
+	Host_StartVideo();
+	if(MR_ToggleMenu)
+		MR_ToggleMenu(m);
+}
+
+void MR_Init_Commands(void)
+{
+	// set router console commands
+	Cvar_RegisterVariable (&forceqmenu);
+	Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
+	Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat)");
+	Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
+}
+
+void MR_Init(void)
+{
+	vid_mode_t res[1024];
+	size_t res_count, i;
+
+	res_count = VID_ListModes(res, sizeof(res) / sizeof(*res));
+	res_count = VID_SortModes(res, res_count, false, false, true);
+	if(res_count)
+	{
+		video_resolutions_count = res_count;
+		video_resolutions = (video_resolution_t *) Mem_Alloc(cls.permanentmempool, sizeof(*video_resolutions) * (video_resolutions_count + 1));
+		memset(&video_resolutions[video_resolutions_count], 0, sizeof(video_resolutions[video_resolutions_count]));
+		for(i = 0; i < res_count; ++i)
+		{
+			int n, d, t;
+			video_resolutions[i].type = "Detected mode"; // FIXME make this more dynamic
+			video_resolutions[i].width = res[i].width;
+			video_resolutions[i].height = res[i].height;
+			video_resolutions[i].pixelheight = res[i].pixelheight_num / (double) res[i].pixelheight_denom;
+			n = res[i].pixelheight_denom * video_resolutions[i].width;
+			d = res[i].pixelheight_num * video_resolutions[i].height;
+			while(d)
+			{
+				t = n;
+				n = d;
+				d = t % d;
+			}
+			d = (res[i].pixelheight_num * video_resolutions[i].height) / n;
+			n = (res[i].pixelheight_denom * video_resolutions[i].width) / n;
+			switch(n * 0x10000 | d)
+			{
+				case 0x00040003:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 480;
+					video_resolutions[i].type = "Standard 4x3";
+					break;
+				case 0x00050004:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 512;
+					if(res[i].pixelheight_denom == res[i].pixelheight_num)
+						video_resolutions[i].type = "Square Pixel (LCD) 5x4";
+					else
+						video_resolutions[i].type = "Short Pixel (CRT) 5x4";
+					break;
+				case 0x00080005:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 400;
+					if(res[i].pixelheight_denom == res[i].pixelheight_num)
+						video_resolutions[i].type = "Widescreen 8x5";
+					else
+						video_resolutions[i].type = "Tall Pixel (CRT) 8x5";
+
+					break;
+				case 0x00050003:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 384;
+					video_resolutions[i].type = "Widescreen 5x3";
+					break;
+				case 0x000D0009:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 400;
+					video_resolutions[i].type = "Widescreen 14x9";
+					break;
+				case 0x00100009:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 480;
+					video_resolutions[i].type = "Widescreen 16x9";
+					break;
+				case 0x00030002:
+					video_resolutions[i].conwidth = 720;
+					video_resolutions[i].conheight = 480;
+					video_resolutions[i].type = "NTSC 3x2";
+					break;
+				case 0x000D000B:
+					video_resolutions[i].conwidth = 720;
+					video_resolutions[i].conheight = 566;
+					video_resolutions[i].type = "PAL 14x11";
+					break;
+				case 0x00080007:
+					if(video_resolutions[i].width >= 512)
+					{
+						video_resolutions[i].conwidth = 512;
+						video_resolutions[i].conheight = 448;
+						video_resolutions[i].type = "SNES 8x7";
+					}
+					else
+					{
+						video_resolutions[i].conwidth = 256;
+						video_resolutions[i].conheight = 224;
+						video_resolutions[i].type = "NES 8x7";
+					}
+					break;
+				default:
+					video_resolutions[i].conwidth = 640;
+					video_resolutions[i].conheight = 640 * d / n;
+					video_resolutions[i].type = "Detected mode";
+					break;
+			}
+			if(video_resolutions[i].conwidth > video_resolutions[i].width || video_resolutions[i].conheight > video_resolutions[i].height)
+			{
+				int f1, f2;
+				f1 = video_resolutions[i].conwidth > video_resolutions[i].width;
+				f2 = video_resolutions[i].conheight > video_resolutions[i].height;
+				if(f1 > f2)
+				{
+					video_resolutions[i].conwidth = video_resolutions[i].width;
+					video_resolutions[i].conheight = video_resolutions[i].conheight / f1;
+				}
+				else
+				{
+					video_resolutions[i].conwidth = video_resolutions[i].conwidth / f2;
+					video_resolutions[i].conheight = video_resolutions[i].height;
+				}
+			}
+		}
+	}
+	else
+	{
+		video_resolutions = video_resolutions_hardcoded;
+		video_resolutions_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
+	}
+
+	menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer;
+	M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value);
+
+	// 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
+// 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
+		MR_SetRouting (FALSE);
+}