X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=e28b04c6fd8244885025eb5ef645ed4cbe4e7ea3;hp=8da41f5233d7aeb2b398e289049d601444bdaded;hb=71de4dd795b4049a7b77a20186820a86a776319d;hpb=4f72e23b6f39b43715dd1ab4b1aae96349fb8022

diff --git a/menu.c b/menu.c
index 8da41f52..e28b04c6 100644
--- a/menu.c
+++ b/menu.c
@@ -28,9 +28,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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[32];
 
 void M_Menu_Main_f (void);
 	void M_Menu_SinglePlayer_f (void);
@@ -54,54 +57,51 @@ void M_Menu_LanConfig_f (void);
 void M_Menu_GameOptions_f (void);
 void M_Menu_ServerList_f (void);
 
-void M_Main_Draw (void);
-	void M_SinglePlayer_Draw (void);
-		void M_Transfusion_Episode_Draw (void);
-			void M_Transfusion_Skill_Draw (void);
-		void M_Load_Draw (void);
-		void M_Save_Draw (void);
-	void M_MultiPlayer_Draw (void);
-		void M_Setup_Draw (void);
-	void M_Options_Draw (void);
-	void M_Options_Effects_Draw (void);
-	void M_Options_Graphics_Draw (void);
-	void M_Options_ColorControl_Draw (void);
-		void M_Keys_Draw (void);
-		void M_Reset_Draw (void);
-		void M_Video_Draw (void);
-	void M_Help_Draw (void);
-	void M_Credits_Draw (void);
-	void M_Quit_Draw (void);
-void M_LanConfig_Draw (void);
-void M_GameOptions_Draw (void);
-void M_ServerList_Draw (void);
-
-void M_Main_Key (int key, char ascii);
-	void M_SinglePlayer_Key (int key, char ascii);
-		void M_Transfusion_Episode_Key (int key, char ascii);
-			void M_Transfusion_Skill_Key (int key, char ascii);
-		void M_Load_Key (int key, char ascii);
-		void M_Save_Key (int key, char ascii);
-	void M_MultiPlayer_Key (int key, char ascii);
-		void M_Setup_Key (int key, char ascii);
-	void M_Options_Key (int key, char ascii);
-	void M_Options_Effects_Key (int key, char ascii);
-	void M_Options_Graphics_Key (int key, char ascii);
-	void M_Options_ColorControl_Key (int key, char ascii);
-		void M_Keys_Key (int key, char ascii);
-		void M_Reset_Key (int key, char ascii);
-		void M_Video_Key (int key, char ascii);
-	void M_Help_Key (int key, char ascii);
-	void M_Credits_Key (int key, char ascii);
-	void M_Quit_Key (int key, char ascii);
-void M_LanConfig_Key (int key, char ascii);
-void M_GameOptions_Key (int key, char ascii);
-void M_ServerList_Key (int key, char ascii);
-
-qboolean	m_entersound;		// play after drawing a frame, so caching
-								// won't disrupt the sound
-
-char		m_return_reason [32];
+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_Main_Key (int key, char ascii);
+	static void M_SinglePlayer_Key (int key, char ascii);
+		static void M_Transfusion_Episode_Key (int key, char ascii);
+			static void M_Transfusion_Skill_Key (int key, char ascii);
+		static void M_Load_Key (int key, char ascii);
+		static void M_Save_Key (int key, char ascii);
+	static void M_MultiPlayer_Key (int key, char ascii);
+		static void M_Setup_Key (int key, char ascii);
+	static void M_Options_Key (int key, char ascii);
+	static void M_Options_Effects_Key (int key, char ascii);
+	static void M_Options_Graphics_Key (int key, char ascii);
+	static void M_Options_ColorControl_Key (int key, char ascii);
+		static void M_Keys_Key (int key, char ascii);
+		static void M_Reset_Key (int key, char ascii);
+		static void M_Video_Key (int key, char ascii);
+	static void M_Help_Key (int key, char ascii);
+	static void M_Credits_Key (int key, char ascii);
+	static void M_Quit_Key (int key, char ascii);
+static void M_LanConfig_Key (int key, char ascii);
+static void M_GameOptions_Key (int key, char ascii);
+static void M_ServerList_Key (int key, char ascii);
+
+static qboolean	m_entersound;		// play after drawing a frame, so caching won't disrupt the sound
 
 void M_Update_Return_Reason(char *s)
 {
@@ -121,7 +121,7 @@ typedef struct nehahrademonames_s
 	char *desc;
 } nehahrademonames_t;
 
-nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
+static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
 {
 	{"intro", "Prologue"},
 	{"genf", "The Beginning"},
@@ -159,9 +159,9 @@ 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_Background(int width, int height)
+static void M_Background(int width, int height)
 {
 	menu_width = bound(1, width, vid_conwidth.integer);
 	menu_height = bound(1, height, vid_conheight.integer);
@@ -178,7 +178,7 @@ 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;
@@ -186,22 +186,22 @@ void M_DrawCharacter (float cx, float cy, int num)
 	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
 }
 
-void M_PrintColored(float cx, float cy, const char *str)
+static void M_PrintColored(float cx, float cy, const char *str)
 {
 	DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
 }
 
-void M_Print(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);
 }
 
-void M_PrintRed (float cx, float cy, const char *str)
+static void M_PrintRed(float cx, float cy, const char *str)
 {
 	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
 }
 
-void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
+static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
 {
 	if (unghosted)
 		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
@@ -209,15 +209,15 @@ void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
 		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
 }
 
-void M_DrawPic (float cx, float cy, const char *picname)
+static void M_DrawPic(float cx, float cy, const char *picname)
 {
-	DrawQ_Pic (menu_x + cx, menu_y + cy, Draw_CachePic(picname, false), 0, 0, 1, 1, 1, 1, 0);
+	DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0);
 }
 
-unsigned char identityTable[256];
-unsigned char translationTable[256];
+static unsigned char identityTable[256];
+static unsigned char translationTable[256];
 
-void M_BuildTranslationTable(int top, int bottom)
+static void M_BuildTranslationTable(int top, int bottom)
 {
 	int j;
 	unsigned char *dest, *source;
@@ -243,8 +243,7 @@ void M_BuildTranslationTable(int top, int bottom)
 			dest[BOTTOM_RANGE+j] = source[bottom+15-j];
 }
 
-
-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;
@@ -304,17 +303,23 @@ void M_ToggleMenu_f (void)
 	m_entersound = true;
 
 	if (key_dest != key_menu || m_state != m_main)
+	{
+		if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1"))
+			return;
 		M_Menu_Main_f ();
+	}
 	else
 	{
+		if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0"))
+			return;
 		key_dest = key_game;
 		m_state = m_none;
 	}
 }
 
 
-int demo_cursor;
-void M_Demo_Draw (void)
+static int demo_cursor;
+static void M_Demo_Draw (void)
 {
 	int i;
 
@@ -335,7 +340,8 @@ void M_Menu_Demos_f (void)
 	m_entersound = true;
 }
 
-void M_Demo_Key (int k, char ascii)
+
+static void M_Demo_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -371,12 +377,16 @@ void M_Demo_Key (int k, char ascii)
 //=============================================================================
 /* 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 (NehGameType == TYPE_DEMO)
@@ -388,18 +398,22 @@ void M_Menu_Main_f (void)
 	}
 	else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
 		MAIN_ITEMS = 6;
-	else if (gamemode == GAME_TRANSFUSION) {
+	else if (gamemode == GAME_TRANSFUSION)
+	{
+		s = "gfx/menu/mainmenu1";
 		if (sv.active && !cl.intermission && cl.islocalgame)
 			MAIN_ITEMS = 8;
 		else
 			MAIN_ITEMS = 7;
 	}
-	else if (gamemode == GAME_NEXUIZ) {
-		MAIN_ITEMS = 2;
-	}
 	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, true)->tex == r_texture_notexture;
+	if (m_missingdata)
+		MAIN_ITEMS = 2;
+
 	/*
 	if (key_dest != key_menu)
 	{
@@ -413,15 +427,32 @@ void M_Menu_Main_f (void)
 }
 
 
-void M_Main_Draw (void)
+static void M_Main_Draw (void)
 {
 	int		f;
 	cachepic_t	*p;
 
+	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", false);
+		p = Draw_CachePic ("gfx/menu/tb-transfusion", true);
 		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
@@ -439,21 +470,10 @@ void M_Main_Draw (void)
 		M_DrawPic (0, 120 + m_main_cursor * 40, va("gfx/menu/mainmenu%iselected", y3));
 		return;
 	}
-	else if (gamemode == GAME_NEXUIZ)
-	{
-		M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that.
-		M_PrintRed (40, (480/3)-16, "You have reached this menu due to missing or unlocatable content/data");
-		M_Print ((640/2)-92, (480/3), "You may consider adding");
-		M_Print ((640/2)-136, (480/3)+8, "-basedir /path/to/nexuiz");
-		M_Print ((640/2)-76, (480/3)+16, "to your launch commandline");
-		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;
-	}
+
 	M_Background(320, 200);
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/ttl_main", false);
+	p = Draw_CachePic ("gfx/ttl_main", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
 // Nehahra
 	if (gamemode == GAME_NEHAHRA)
@@ -474,7 +494,7 @@ void M_Main_Draw (void)
 }
 
 
-void M_Main_Key (int key, char ascii)
+static void M_Main_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -501,7 +521,24 @@ void M_Main_Key (int key, char ascii)
 	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)
 			{
@@ -688,22 +725,6 @@ void M_Main_Key (int key, char ascii)
 				}
 			}
 		}
-		else if (gamemode == GAME_NEXUIZ) {
-			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
 		{
 			switch (m_main_cursor)
@@ -735,7 +756,7 @@ void M_Main_Key (int key, char ascii)
 //=============================================================================
 /* SINGLE PLAYER MENU */
 
-int	m_singleplayer_cursor;
+static int	m_singleplayer_cursor;
 #define	SINGLEPLAYER_ITEMS	3
 
 
@@ -747,14 +768,14 @@ void M_Menu_SinglePlayer_f (void)
 }
 
 
-void M_SinglePlayer_Draw (void)
+static void M_SinglePlayer_Draw (void)
 {
 	cachepic_t	*p;
 
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/ttl_sgl", false);
+	p = Draw_CachePic ("gfx/ttl_sgl", true);
 
 	// Some mods don't have a single player mode
 	if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
@@ -782,7 +803,7 @@ void M_SinglePlayer_Draw (void)
 }
 
 
-void M_SinglePlayer_Key (int key, char ascii)
+static void M_SinglePlayer_Key (int key, char ascii)
 {
 	if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
 	{
@@ -844,13 +865,13 @@ void M_SinglePlayer_Key (int key, char ascii)
 //=============================================================================
 /* 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, len;
 	char	name[MAX_OSPATH];
@@ -861,7 +882,7 @@ void M_ScanSaves (void)
 
 	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%i.sav", (int)i);
 		f = FS_Open (name, "rb", false, false);
@@ -872,10 +893,10 @@ void M_ScanSaves (void)
 		buf[sizeof(buf) - 1] = 0;
 		t = buf;
 		// version
-		COM_ParseToken(&t, false);
+		COM_ParseTokenConsole(&t);
 		version = atoi(com_token);
 		// description
-		COM_ParseToken(&t, false);
+		COM_ParseTokenConsole(&t);
 		strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
 
 	// change _ back to space
@@ -911,14 +932,14 @@ void M_Menu_Save_f (void)
 }
 
 
-void M_Load_Draw (void)
+static void M_Load_Draw (void)
 {
 	int		i;
 	cachepic_t	*p;
 
 	M_Background(320, 200);
 
-	p = Draw_CachePic ("gfx/p_load", false);
+	p = Draw_CachePic ("gfx/p_load", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
 
 	for (i=0 ; i< MAX_SAVEGAMES; i++)
@@ -929,14 +950,14 @@ void M_Load_Draw (void)
 }
 
 
-void M_Save_Draw (void)
+static void M_Save_Draw (void)
 {
 	int		i;
 	cachepic_t	*p;
 
 	M_Background(320, 200);
 
-	p = Draw_CachePic ("gfx/p_save", false);
+	p = Draw_CachePic ("gfx/p_save", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
 
 	for (i=0 ; i<MAX_SAVEGAMES ; i++)
@@ -947,7 +968,7 @@ void M_Save_Draw (void)
 }
 
 
-void M_Load_Key (int k, char ascii)
+static void M_Load_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -988,7 +1009,7 @@ void M_Load_Key (int k, char ascii)
 }
 
 
-void M_Save_Key (int k, char ascii)
+static void M_Save_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -1026,7 +1047,7 @@ void M_Save_Key (int k, char ascii)
 //=============================================================================
 /* Transfusion Single Player Episode Menu */
 
-int	m_episode_cursor;
+static int	m_episode_cursor;
 #define	EPISODE_ITEMS	6
 
 void M_Menu_Transfusion_Episode_f (void)
@@ -1036,13 +1057,13 @@ void M_Menu_Transfusion_Episode_f (void)
 	key_dest = key_menu;
 }
 
-void M_Transfusion_Episode_Draw (void)
+static void M_Transfusion_Episode_Draw (void)
 {
 	int y;
 	cachepic_t *p;
 	M_Background(640, 480);
 
-	p = Draw_CachePic ("gfx/menu/tb-episodes", false);
+	p = Draw_CachePic ("gfx/menu/tb-episodes", true);
 	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));
@@ -1051,7 +1072,7 @@ void M_Transfusion_Episode_Draw (void)
 	M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1));
 }
 
-void M_Transfusion_Episode_Key (int key, char ascii)
+static void M_Transfusion_Episode_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -1083,7 +1104,7 @@ void M_Transfusion_Episode_Key (int key, char ascii)
 //=============================================================================
 /* Transfusion Single Player Skill Menu */
 
-int	m_skill_cursor = 2;
+static int	m_skill_cursor = 2;
 #define	SKILL_ITEMS	5
 
 void M_Menu_Transfusion_Skill_f (void)
@@ -1093,13 +1114,13 @@ void M_Menu_Transfusion_Skill_f (void)
 	key_dest = key_menu;
 }
 
-void M_Transfusion_Skill_Draw (void)
+static void M_Transfusion_Skill_Draw (void)
 {
 	int y;
 	cachepic_t	*p;
 	M_Background(640, 480);
 
-	p = Draw_CachePic ("gfx/menu/tb-difficulty", false);
+	p = Draw_CachePic ("gfx/menu/tb-difficulty", true);
 	M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty");
 
 	for (y = 0; y < SKILL_ITEMS; y++)
@@ -1109,7 +1130,7 @@ void M_Transfusion_Skill_Draw (void)
 	M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1));
 }
 
-void M_Transfusion_Skill_Key (int key, char ascii)
+static void M_Transfusion_Skill_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -1183,7 +1204,7 @@ void M_Transfusion_Skill_Key (int key, char ascii)
 //=============================================================================
 /* MULTIPLAYER MENU */
 
-int	m_multiplayer_cursor;
+static int	m_multiplayer_cursor;
 #define	MULTIPLAYER_ITEMS	3
 
 
@@ -1195,7 +1216,7 @@ void M_Menu_MultiPlayer_f (void)
 }
 
 
-void M_MultiPlayer_Draw (void)
+static void M_MultiPlayer_Draw (void)
 {
 	int		f;
 	cachepic_t	*p;
@@ -1203,7 +1224,7 @@ void M_MultiPlayer_Draw (void)
 	if (gamemode == GAME_TRANSFUSION)
 	{
 		M_Background(640, 480);
-		p = Draw_CachePic ("gfx/menu/tb-online", false);
+		p = Draw_CachePic ("gfx/menu/tb-online", true);
 		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));
@@ -1213,7 +1234,7 @@ void M_MultiPlayer_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", false);
+	p = Draw_CachePic ("gfx/p_multi", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 	M_DrawPic (72, 32, "gfx/mp_menu");
 
@@ -1223,7 +1244,7 @@ void M_MultiPlayer_Draw (void)
 }
 
 
-void M_MultiPlayer_Key (int key, char ascii)
+static void M_MultiPlayer_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -1262,16 +1283,16 @@ void M_MultiPlayer_Key (int key, char ascii)
 //=============================================================================
 /* SETUP MENU */
 
-int		setup_cursor = 4;
-int		setup_cursor_table[] = {40, 64, 88, 124, 140};
+static int		setup_cursor = 4;
+static int		setup_cursor_table[] = {40, 64, 88, 124, 140};
 
-char	setup_myname[32];
-int		setup_oldtop;
-int		setup_oldbottom;
-int		setup_top;
-int		setup_bottom;
-int		setup_rate;
-int		setup_oldrate;
+static char	setup_myname[32];
+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
 
@@ -1280,7 +1301,7 @@ void M_Menu_Setup_f (void)
 	key_dest = key_menu;
 	m_state = m_setup;
 	m_entersound = true;
-	strcpy(setup_myname, cl_name.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;
@@ -1323,7 +1344,7 @@ static int setup_rateindex(int rate)
 	return bound(1, i, RATES) - 1;
 }
 
-void M_Setup_Draw (void)
+static void M_Setup_Draw (void)
 {
 	int i;
 	cachepic_t	*p;
@@ -1331,7 +1352,7 @@ void M_Setup_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", false);
+	p = Draw_CachePic ("gfx/p_multi", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 
 	M_Print(64, 40, "Your name");
@@ -1364,8 +1385,8 @@ void M_Setup_Draw (void)
 			menuplyr_width = image_width;
 			menuplyr_height = image_height;
 			Mem_Free(f);
-			menuplyr_pixels = (unsigned char *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height);
-			menuplyr_translated = (unsigned int *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4);
+			menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height);
+			menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height * 4);
 			memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
 			Mem_Free(data);
 		}
@@ -1393,7 +1414,7 @@ void M_Setup_Draw (void)
 }
 
 
-void M_Setup_Key (int k, char ascii)
+static void M_Setup_Key (int k, char ascii)
 {
 	int			l;
 
@@ -1507,7 +1528,7 @@ forward:
 
 #define	SLIDER_RANGE	10
 
-void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
+static void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
 {
 	char text[16];
 	int i;
@@ -1525,7 +1546,7 @@ void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
 	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");
@@ -1534,9 +1555,9 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 40
+#define OPTIONS_ITEMS 38
 
-int options_cursor;
+static int options_cursor;
 
 void M_Menu_Options_f (void)
 {
@@ -1550,7 +1571,7 @@ extern dllhandle_t jpeg_dll;
 extern cvar_t gl_texture_anisotropy;
 extern cvar_t r_textshadow;
 
-void M_Menu_Options_AdjustSliders (int dir)
+static void M_Menu_Options_AdjustSliders (int dir)
 {
 	int optnum;
 	S_LocalSound ("sound/misc/menu3.wav");
@@ -1560,8 +1581,6 @@ void M_Menu_Options_AdjustSliders (int dir)
 		Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_conspeed, bound(0, scr_conspeed.value + dir * 100, 1000));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
 	else if (options_cursor == optnum++)
@@ -1579,7 +1598,7 @@ void M_Menu_Options_AdjustSliders (int dir)
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
 	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&scr_screenshot_gamma, bound(0.1, scr_screenshot_gamma.value + dir * 0.1, 4));
+		Cvar_SetValueQuick (&scr_screenshot_gammaboost, bound(0.1, scr_screenshot_gammaboost.value + dir * 0.1, 4));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&r_sky, !r_sky.integer);
 	else if (options_cursor == optnum++)
@@ -1600,8 +1619,6 @@ void M_Menu_Options_AdjustSliders (int dir)
 		Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6));
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
-	else if (options_cursor == optnum++)
-		Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
 	else if (options_cursor == optnum++)
 		Cvar_SetValueQuick (&showfps, !showfps.integer);
 	else if (options_cursor == optnum++)
@@ -1635,11 +1652,11 @@ void M_Menu_Options_AdjustSliders (int dir)
 		Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
 }
 
-int optnum;
-int opty;
-int optcursor;
+static int optnum;
+static int opty;
+static int optcursor;
 
-void M_Options_PrintCommand(const char *s, int enabled)
+static void M_Options_PrintCommand(const char *s, int enabled)
 {
 	if (opty >= 32)
 	{
@@ -1650,7 +1667,7 @@ void M_Options_PrintCommand(const char *s, int enabled)
 	optnum++;
 }
 
-void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
+static void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
 {
 	if (opty >= 32)
 	{
@@ -1662,7 +1679,7 @@ void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
 	optnum++;
 }
 
-void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
+static void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
 {
 	if (opty >= 32)
 	{
@@ -1674,7 +1691,7 @@ void M_Options_PrintSlider(const char *s, int enabled, float value, float minval
 	optnum++;
 }
 
-void M_Options_Draw (void)
+static void M_Options_Draw (void)
 {
 	int visible;
 	cachepic_t	*p;
@@ -1682,12 +1699,12 @@ void M_Options_Draw (void)
 	M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", false);
+	p = Draw_CachePic("gfx/p_option", true);
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optnum = 0;
 	optcursor = options_cursor;
-	visible = (menu_height - 32) / 8;
+	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);
@@ -1699,7 +1716,6 @@ void M_Options_Draw (void)
 	M_Options_PrintCommand( "     Color Control", true);
 	M_Options_PrintSlider(  "  2D Screen Width ", true, vid_conwidth.value, 320, 2048);
 	M_Options_PrintSlider(  "  2D Screen Height", true, vid_conheight.value, 240, 1536);
-	M_Options_PrintSlider(  "     Console Speed", true, scr_conspeed.value, 0, 1000);
 	M_Options_PrintSlider(  "     Console Alpha", true, scr_conalpha.value, 0, 1);
 	M_Options_PrintSlider(  "Conback Brightness", true, scr_conbrightness.value, 0, 1);
 	M_Options_PrintSlider(  "     Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
@@ -1708,7 +1724,7 @@ void M_Options_Draw (void)
 	M_Options_PrintSlider(  "     Field of View", true, scr_fov.integer, 1, 170);
 	M_Options_PrintCheckbox("  JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
 	M_Options_PrintSlider(  "      JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
-	M_Options_PrintSlider(  "  Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gamma.value, 0.1, 4);
+	M_Options_PrintSlider(  "  Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gammaboost.value, 0.1, 4);
 	M_Options_PrintCheckbox("               Sky", true, r_sky.integer);
 	M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
 	M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
@@ -1719,7 +1735,6 @@ void M_Options_Draw (void)
 	M_Options_PrintCheckbox("       Text Shadow", true, r_textshadow.integer);
 	M_Options_PrintSlider(  "         Crosshair", true, crosshair.value, 0, 5);
 	M_Options_PrintSlider(  "    Crosshair Size", true, crosshair_size.value, 1, 5);
-	M_Options_PrintCheckbox("  Static Crosshair", true, crosshair_static.integer);
 	M_Options_PrintCheckbox("    Show Framerate", true, showfps.integer);
 	M_Options_PrintCheckbox("         Show Time", true, showtime.integer);
 	M_Options_PrintCheckbox("         Show Date", true, showdate.integer);
@@ -1733,7 +1748,7 @@ void M_Options_Draw (void)
 }
 
 
-void M_Options_Key (int k, char ascii)
+static void M_Options_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -1798,9 +1813,9 @@ void M_Options_Key (int k, char ascii)
 	}
 }
 
-#define	OPTIONS_EFFECTS_ITEMS	35
+#define	OPTIONS_EFFECTS_ITEMS	36
 
-int options_effects_cursor;
+static int options_effects_cursor;
 
 void M_Menu_Options_Effects_f (void)
 {
@@ -1815,8 +1830,9 @@ extern cvar_t cl_stainmaps_clearonload;
 extern cvar_t r_explosionclip;
 extern cvar_t r_coronas;
 extern cvar_t gl_flashblend;
-extern cvar_t cl_beams_polygon;
-extern cvar_t cl_beams_relative;
+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;
@@ -1826,7 +1842,7 @@ extern cvar_t r_lightningbeam_color_green;
 extern cvar_t r_lightningbeam_color_blue;
 extern cvar_t r_lightningbeam_qmbtexture;
 
-void M_Menu_Options_Effects_AdjustSliders (int dir)
+static void M_Menu_Options_Effects_AdjustSliders (int dir)
 {
 	int optnum;
 	S_LocalSound ("sound/misc/menu3.wav");
@@ -1850,7 +1866,8 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
 	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_polygons, !cl_beams_polygons.integer);
-	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_relative, !cl_beams_relative.integer);
+	else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_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));
@@ -1869,7 +1886,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
 	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)
 {
 	int visible;
 	cachepic_t	*p;
@@ -1877,12 +1894,12 @@ void M_Options_Effects_Draw (void)
 	M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", false);
+	p = Draw_CachePic("gfx/p_option", true);
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optcursor = options_effects_cursor;
 	optnum = 0;
-	visible = (menu_height - 32) / 8;
+	visible = (int)((menu_height - 32) / 8);
 	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
 
 	M_Options_PrintSlider(  "      Corona Intensity", true, r_coronas.value, 0, 4);
@@ -1902,8 +1919,9 @@ void M_Options_Effects_Draw (void)
 	M_Options_PrintCheckbox("                 Blood", true, cl_particles_blood.integer);
 	M_Options_PrintSlider(  "         Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1);
 	M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer);
-	M_Options_PrintCheckbox("    Lightning Polygons", true, cl_beams_polygons.integer);
-	M_Options_PrintCheckbox("Lightning Smooth Sweep", true, cl_beams_relative.integer);
+	M_Options_PrintCheckbox("     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);
@@ -1923,7 +1941,7 @@ void M_Options_Effects_Draw (void)
 }
 
 
-void M_Options_Effects_Key (int k, char ascii)
+static void M_Options_Effects_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -1960,9 +1978,9 @@ void M_Options_Effects_Key (int k, char ascii)
 }
 
 
-#define	OPTIONS_GRAPHICS_ITEMS	14
+#define	OPTIONS_GRAPHICS_ITEMS	20
 
-int options_graphics_cursor;
+static int options_graphics_cursor;
 
 void M_Menu_Options_Graphics_f (void)
 {
@@ -1979,13 +1997,19 @@ extern cvar_t r_shadow_realtime_world_dlightshadows;
 extern cvar_t r_shadow_realtime_world_lightmaps;
 extern cvar_t r_shadow_realtime_world_shadows;
 extern cvar_t r_bloom;
-extern cvar_t r_bloom_intensity;
-extern cvar_t r_bloom_power;
+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;
 
-void M_Menu_Options_Graphics_AdjustSliders (int dir)
+static void M_Menu_Options_Graphics_AdjustSliders (int dir)
 {
 	int optnum;
 	S_LocalSound ("sound/misc/menu3.wav");
@@ -1999,9 +2023,15 @@ void M_Menu_Options_Graphics_AdjustSliders (int dir)
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows,	!r_shadow_realtime_world_dlightshadows.integer);
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps,		bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows,			!r_shadow_realtime_world_shadows.integer);
+	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness,                   bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4));
 	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom,                                 !r_bloom.integer);
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_intensity,                       bound(1, r_bloom_intensity.value + dir * 1, 16));
-	else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_power,                           bound(1, r_bloom_power.value + dir * 1, 16));
+	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.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++) Cvar_SetValueQuick (&gl_picmip,                               bound(0, gl_picmip.value - dir, 3));
@@ -2009,7 +2039,7 @@ void M_Menu_Options_Graphics_AdjustSliders (int dir)
 }
 
 
-void M_Options_Graphics_Draw (void)
+static void M_Options_Graphics_Draw (void)
 {
 	int visible;
 	cachepic_t	*p;
@@ -2017,12 +2047,12 @@ void M_Options_Graphics_Draw (void)
 	M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", false);
+	p = Draw_CachePic("gfx/p_option", true);
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optcursor = options_graphics_cursor;
 	optnum = 0;
-	visible = (menu_height - 32) / 8;
+	visible = (int)((menu_height - 32) / 8);
 	opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
 
 	M_Options_PrintSlider(  "             Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
@@ -2032,17 +2062,23 @@ void M_Options_Graphics_Draw (void)
 	M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
 	M_Options_PrintSlider(  "     RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
 	M_Options_PrintCheckbox("        RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
-	M_Options_PrintCheckbox("           Bloom Effect", true, r_bloom.integer);
-	M_Options_PrintSlider(  "        Bloom Intensity", true, r_bloom_intensity.value, 1, 16);
-	M_Options_PrintSlider(  "            Bloom Power", true, r_bloom_power.value, 1, 16);
-	M_Options_PrintSlider(  "             Bloom Blur", true, r_bloom_blur.value, 1, 16);
-	M_Options_PrintSlider(  "       Bloom Resolution", true, r_bloom_resolution.value, 64, 2048);
+	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", r_hdr.integer, r_hdr.integer);
+	M_Options_PrintSlider(  "      HDR Dynamic Range", true, 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_PrintSlider(  "        Texture Quality", true, gl_picmip.value, 3, 0);
 	M_Options_PrintCommand( "       Restart Renderer", true);
 }
 
 
-void M_Options_Graphics_Key (int k, char ascii)
+static void M_Options_Graphics_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -2081,10 +2117,10 @@ void M_Options_Graphics_Key (int k, char ascii)
 
 #define	OPTIONS_COLORCONTROL_ITEMS	18
 
-int		options_colorcontrol_cursor;
+static int		options_colorcontrol_cursor;
 
 // intensity value to match up to 50% dither to 'correct' quake
-cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"};
+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)
 {
@@ -2094,7 +2130,7 @@ void M_Menu_Options_ColorControl_f (void)
 }
 
 
-void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+static void M_Menu_Options_ColorControl_AdjustSliders (int dir)
 {
 	int optnum;
 	float f;
@@ -2193,23 +2229,23 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir)
 	}
 }
 
-void M_Options_ColorControl_Draw (void)
+static void M_Options_ColorControl_Draw (void)
 {
 	int visible;
 	float x, c, s, t, u, v;
 	cachepic_t	*p, *dither;
 
-	dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", false);
+	dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", true);
 
 	M_Background(320, 256);
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/p_option", false);
+	p = Draw_CachePic("gfx/p_option", true);
 	M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
 
 	optcursor = options_colorcontrol_cursor;
 	optnum = 0;
-	visible = (menu_height - 32) / 8;
+	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);
@@ -2269,7 +2305,7 @@ void M_Options_ColorControl_Draw (void)
 }
 
 
-void M_Options_ColorControl_Key (int k, char ascii)
+static void M_Options_ColorControl_Key (int k, char ascii)
 {
 	switch (k)
 	{
@@ -2331,7 +2367,7 @@ void M_Options_ColorControl_Key (int k, char ascii)
 //=============================================================================
 /* KEYS MENU */
 
-char *quakebindnames[][2] =
+static char *quakebindnames[][2] =
 {
 {"+attack", 		"attack"},
 {"impulse 10", 		"next weapon"},
@@ -2354,7 +2390,7 @@ char *quakebindnames[][2] =
 {"+movedown",		"swim down"}
 };
 
-char *transfusionbindnames[][2] =
+static char *transfusionbindnames[][2] =
 {
 {"",				"Movement"},		// Movement commands
 {"+forward", 		"walk forward"},
@@ -2412,7 +2448,7 @@ char *transfusionbindnames[][2] =
 {"impulse 79",		"taunt 9"}
 };
 
-char *goodvsbad2bindnames[][2] =
+static char *goodvsbad2bindnames[][2] =
 {
 {"impulse 69",		"Power 1"},
 {"impulse 70",		"Power 2"},
@@ -2435,8 +2471,8 @@ char *goodvsbad2bindnames[][2] =
 {"+movedown",		"swim down"}
 };
 
-int numcommands;
-char *(*bindnames)[2];
+static int numcommands;
+static char *(*bindnames)[2];
 
 /*
 typedef struct binditem_s
@@ -2454,9 +2490,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)
 	{
@@ -2471,7 +2507,7 @@ 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);
@@ -2481,7 +2517,7 @@ void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
 	strcpy(*b->description, description);
 }
 
-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)
 	{
@@ -2495,7 +2531,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");
@@ -2529,8 +2565,8 @@ void M_DefaultBinds (void)
 */
 
 
-int		keys_cursor;
-int		bind_grab;
+static int		keys_cursor;
+static int		bind_grab;
 
 void M_Menu_Keys_f (void)
 {
@@ -2566,7 +2602,7 @@ void M_FindKeysForCommand (const char *command, int *keys)
 	}
 }
 
-void M_UnbindCommand (char *command)
+static void M_UnbindCommand (char *command)
 {
 	int		j;
 	char	*b;
@@ -2582,7 +2618,7 @@ void M_UnbindCommand (char *command)
 }
 
 
-void M_Keys_Draw (void)
+static void M_Keys_Draw (void)
 {
 	int		i, j;
 	int		keys[NUMKEYS];
@@ -2592,7 +2628,7 @@ void M_Keys_Draw (void)
 
 	M_Background(320, 48 + 8 * numcommands);
 
-	p = Draw_CachePic ("gfx/ttl_cstm", false);
+	p = Draw_CachePic ("gfx/ttl_cstm", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
 
 	if (bind_grab)
@@ -2619,7 +2655,7 @@ void M_Keys_Draw (void)
 
 		// 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;
@@ -2628,8 +2664,8 @@ 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));
 				}
 			}
 		}
@@ -2643,7 +2679,7 @@ void M_Keys_Draw (void)
 }
 
 
-void M_Keys_Key (int k, char ascii)
+static void M_Keys_Key (int k, char ascii)
 {
 	char	cmd[80];
 	int		keys[NUMKEYS];
@@ -2719,13 +2755,13 @@ void M_Menu_Reset_f (void)
 }
 
 
-void M_Reset_Key (int key, char ascii)
+static void M_Reset_Key (int key, char ascii)
 {
 	switch (key)
 	{
 	case 'Y':
 	case 'y':
-		Cbuf_AddText ("exec default.cfg\n");
+		Cbuf_AddText ("cvar_resettodefaults_all;exec default.cfg\n");
 		// no break here since we also exit the menu
 
 	case K_ESCAPE:
@@ -2740,7 +2776,7 @@ void M_Reset_Key (int key, char ascii)
 	}
 }
 
-void M_Reset_Draw (void)
+static void M_Reset_Draw (void)
 {
 	int lines = 2, linelength = 20;
 	M_Background(linelength * 8 + 16, lines * 8 + 16);
@@ -2825,9 +2861,9 @@ video_resolution_t video_resolutions[] =
 #define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
 
 #define VIDEO_ITEMS 7
-int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
-int video_resolution;
+static int video_cursor = 0;
+static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
+static int video_resolution;
 
 void M_Menu_Video_f (void)
 {
@@ -2871,14 +2907,14 @@ void M_Menu_Video_f (void)
 }
 
 
-void M_Video_Draw (void)
+static void M_Video_Draw (void)
 {
 	cachepic_t	*p;
 
 	M_Background(320, 200);
 
 	M_DrawPic(16, 4, "gfx/qplaque");
-	p = Draw_CachePic("gfx/vidmodes", false);
+	p = Draw_CachePic("gfx/vidmodes", true);
 	M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
 
 	// Current Resolution
@@ -2917,7 +2953,7 @@ void M_Video_Draw (void)
 }
 
 
-void M_Menu_Video_AdjustSliders (int dir)
+static void M_Menu_Video_AdjustSliders (int dir)
 {
 	S_LocalSound ("sound/misc/menu3.wav");
 
@@ -2959,7 +2995,7 @@ void M_Menu_Video_AdjustSliders (int dir)
 }
 
 
-void M_Video_Key (int key, char ascii)
+static void M_Video_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -3019,7 +3055,7 @@ void M_Video_Key (int key, char ascii)
 //=============================================================================
 /* HELP MENU */
 
-int		help_page;
+static int		help_page;
 #define	NUM_HELP_PAGES	6
 
 
@@ -3033,14 +3069,14 @@ void M_Menu_Help_f (void)
 
 
 
-void M_Help_Draw (void)
+static void M_Help_Draw (void)
 {
 	M_Background(320, 200);
 	M_DrawPic (0, 0, va("gfx/help%i", help_page));
 }
 
 
-void M_Help_Key (int key, char ascii)
+static void M_Help_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -3077,7 +3113,7 @@ void M_Menu_Credits_f (void)
 
 
 
-void M_Credits_Draw (void)
+static void M_Credits_Draw (void)
 {
 	M_Background(640, 480);
 	M_DrawPic (0, 0, "gfx/creditsmiddle");
@@ -3087,7 +3123,7 @@ void M_Credits_Draw (void)
 }
 
 
-void M_Credits_Key (int key, char ascii)
+static void M_Credits_Key (int key, char ascii)
 {
 		M_Menu_Main_f ();
 }
@@ -3095,12 +3131,12 @@ void M_Credits_Key (int key, char ascii)
 //=============================================================================
 /* QUIT MENU */
 
-char *m_quit_message[9];
-int		m_quit_prevstate;
-qboolean	wasInMenus;
+static char *m_quit_message[9];
+static int		m_quit_prevstate;
+static qboolean	wasInMenus;
 
 
-int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
+static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
 {
 	m_quit_message[0] = line1;
 	m_quit_message[1] = line2;
@@ -3114,8 +3150,14 @@ int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line
 	return 1;
 }
 
-int M_ChooseQuitMessage(int request)
+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:
@@ -3161,9 +3203,6 @@ int M_ChooseQuitMessage(int request)
 		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;
-	case GAME_NEXUIZ: //frag related quit messages are pointless for a fallback menu!
-		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);
-		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);
@@ -3185,13 +3224,13 @@ void M_Menu_Quit_f (void)
 	m_state = m_quit;
 	m_entersound = true;
 	// count how many there are
-	for (n = 0;M_ChooseQuitMessage(n);n++);
+	for (n = 1;M_ChooseQuitMessage(n);n++);
 	// choose one
 	M_ChooseQuitMessage(rand() % n);
 }
 
 
-void M_Quit_Key (int key, char ascii)
+static void M_Quit_Key (int key, char ascii)
 {
 	switch (key)
 	{
@@ -3220,7 +3259,7 @@ void M_Quit_Key (int key, char ascii)
 	}
 }
 
-void M_Quit_Draw (void)
+static void M_Quit_Draw (void)
 {
 	int i, l, linelength, firstline, lastline, lines;
 	for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
@@ -3237,8 +3276,8 @@ void M_Quit_Draw (void)
 	}
 	lines = (lastline - firstline) + 1;
 	M_Background(linelength * 8 + 16, lines * 8 + 16);
-	if (gamemode != GAME_NEXUIZ) //since this is a fallback menu for Nexuiz (no graphics), 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 Nexuiz
+	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]);
 }
@@ -3246,13 +3285,13 @@ void M_Quit_Draw (void)
 //=============================================================================
 /* LAN CONFIG MENU */
 
-int		lanConfig_cursor = -1;
-int		lanConfig_cursor_table [] = {56, 76, 112};
-#define NUM_LANCONFIG_CMDS	3
+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[22];
 
 void M_Menu_LanConfig_f (void)
 {
@@ -3267,13 +3306,13 @@ void M_Menu_LanConfig_f (void)
 	if (StartingGame)
 		lanConfig_cursor = 1;
 	lanConfig_port = 26000;
-	sprintf(lanConfig_portname, "%u", lanConfig_port);
+	sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
 
 	M_Update_Return_Reason("");
 }
 
 
-void M_LanConfig_Draw (void)
+static void M_LanConfig_Draw (void)
 {
 	cachepic_t	*p;
 	int		basex;
@@ -3283,7 +3322,7 @@ void M_LanConfig_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", false);
+	p = Draw_CachePic ("gfx/p_multi", true);
 	basex = (320-p->width)/2;
 	M_DrawPic (basex, 4, "gfx/p_multi");
 
@@ -3301,10 +3340,11 @@ void M_LanConfig_Draw (void)
 
 	if (JoiningGame)
 	{
-		M_Print(basex, lanConfig_cursor_table[1], "Search for games...");
-		M_Print(basex, lanConfig_cursor_table[2]-16, "Join game at:");
-		M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1);
-		M_Print(basex+16, lanConfig_cursor_table[2], 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, 22, 1);
+		M_Print(basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
 	}
 	else
 	{
@@ -3315,17 +3355,17 @@ void M_LanConfig_Draw (void)
 	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 == 2)
-		M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
+	if (lanConfig_cursor == 3)
+		M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(realtime*4)&1));
 
 	if (*m_return_reason)
 		M_Print(basex, 168, m_return_reason);
 }
 
 
-void M_LanConfig_Key (int key, char ascii)
+static void M_LanConfig_Key (int key, char ascii)
 {
 	int		l;
 
@@ -3340,6 +3380,9 @@ void M_LanConfig_Key (int key, char ascii)
 		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:
@@ -3347,6 +3390,9 @@ void M_LanConfig_Key (int key, char ascii)
 		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:
@@ -3359,7 +3405,7 @@ void M_LanConfig_Key (int key, char ascii)
 
 		Cvar_SetValue("port", lanConfig_port);
 
-		if (lanConfig_cursor == 1)
+		if (lanConfig_cursor == 1 || lanConfig_cursor == 2)
 		{
 			if (StartingGame)
 			{
@@ -3370,7 +3416,7 @@ void M_LanConfig_Key (int key, char ascii)
 			break;
 		}
 
-		if (lanConfig_cursor == 2)
+		if (lanConfig_cursor == 3)
 			Cbuf_AddText ( va ("connect \"%s\"\n", lanConfig_joinname) );
 		break;
 
@@ -3381,7 +3427,7 @@ void M_LanConfig_Key (int key, char ascii)
 				lanConfig_portname[strlen(lanConfig_portname)-1] = 0;
 		}
 
-		if (lanConfig_cursor == 2)
+		if (lanConfig_cursor == 3)
 		{
 			if (strlen(lanConfig_joinname))
 				lanConfig_joinname[strlen(lanConfig_joinname)-1] = 0;
@@ -3392,7 +3438,7 @@ void M_LanConfig_Key (int key, char ascii)
 		if (ascii < 32)
 			break;
 
-		if (lanConfig_cursor == 2)
+		if (lanConfig_cursor == 3)
 		{
 			l = (int)strlen(lanConfig_joinname);
 			if (l < 21)
@@ -3415,7 +3461,7 @@ void M_LanConfig_Key (int key, char ascii)
 		}
 	}
 
-	if (StartingGame && lanConfig_cursor == 2)
+	if (StartingGame && lanConfig_cursor == 3)
 	{
 		if (key == K_UPARROW)
 			lanConfig_cursor = 1;
@@ -3426,7 +3472,7 @@ void M_LanConfig_Key (int key, char ascii)
 	l =  atoi(lanConfig_portname);
 	if (l <= 65535)
 		lanConfig_port = l;
-	sprintf(lanConfig_portname, "%u", lanConfig_port);
+	sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
 }
 
 //=============================================================================
@@ -3454,7 +3500,7 @@ typedef struct gamelevels_s
 }
 gamelevels_t;
 
-level_t quakelevels[] =
+static level_t quakelevels[] =
 {
 	{"start", "Entrance"},	// 0
 
@@ -3502,7 +3548,7 @@ level_t quakelevels[] =
 	{"dm6", "The Dark Zone"}
 };
 
-episode_t quakeepisodes[] =
+static episode_t quakeepisodes[] =
 {
 	{"Welcome to Quake", 0, 1},
 	{"Doomed Dimension", 1, 8},
@@ -3514,7 +3560,7 @@ episode_t quakeepisodes[] =
 };
 
  //MED 01/06/97 added hipnotic levels
-level_t     hipnoticlevels[] =
+static level_t     hipnoticlevels[] =
 {
    {"start", "Command HQ"},  // 0
 
@@ -3542,7 +3588,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},
@@ -3554,7 +3600,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"},
@@ -3577,7 +3623,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},
@@ -3585,7 +3631,7 @@ episode_t	rogueepisodes[] =
 	{"Deathmatch Arena", 16, 1}
 };
 
-level_t		nehahralevels[] =
+static level_t		nehahralevels[] =
 {
 	{"nehstart",	"Welcome to Nehahra"},
 	{"neh1m1",	"Forge City1: Slipgates"},
@@ -3608,7 +3654,7 @@ level_t		nehahralevels[] =
 	{"nehend",	"Quintessence"}
 };
 
-episode_t	nehahraepisodes[] =
+static episode_t	nehahraepisodes[] =
 {
 	{"Welcome to Nehahra", 0, 1},
 	{"The Fall of Forge", 1, 9},
@@ -3617,7 +3663,7 @@ episode_t	nehahraepisodes[] =
 };
 
 // Map list for Transfusion
-level_t		transfusionlevels[] =
+static level_t		transfusionlevels[] =
 {
 	{"e1m1",		"Cradle to Grave"},
 	{"e1m2",		"Wrong Side of the Tracks"},
@@ -3725,7 +3771,7 @@ level_t		transfusionlevels[] =
 	{"simple",		"Dead Simple"}
 };
 
-episode_t	transfusionepisodes[] =
+static episode_t	transfusionepisodes[] =
 {
 	{"The Way of All Flesh", 0, 8},
 	{"Even Death May Die", 8, 9},
@@ -3740,7 +3786,7 @@ episode_t	transfusionepisodes[] =
 	{"Conversions", 85, 9}
 };
 
-level_t goodvsbad2levels[] =
+static level_t goodvsbad2levels[] =
 {
 	{"rts", "Many Paths"},  // 0
 	{"chess", "Chess, Scott Hess"},                         // 1
@@ -3753,12 +3799,12 @@ level_t goodvsbad2levels[] =
 	{"island", "Adventure Islands"},
 };
 
-episode_t goodvsbad2episodes[] =
+static episode_t goodvsbad2episodes[] =
 {
 	{"Levels? Bevels!", 0, 8},
 };
 
-level_t battlemechlevels[] =
+static level_t battlemechlevels[] =
 {
 	{"start", "Parking Level"},
 	{"dm1", "Hot Dump"},                        // 1
@@ -3769,12 +3815,12 @@ level_t battlemechlevels[] =
 	{"dm6", "Army go Underground"},
 };
 
-episode_t battlemechepisodes[] =
+static episode_t battlemechepisodes[] =
 {
 	{"Time for Battle", 0, 7},
 };
 
-level_t openquartzlevels[] =
+static level_t openquartzlevels[] =
 {
 	{"start", "Welcome to Openquartz"},
 
@@ -3793,35 +3839,49 @@ level_t openquartzlevels[] =
 	{"am1", "The nameless chambers"},
 };
 
-episode_t openquartzepisodes[] =
+static episode_t openquartzepisodes[] =
 {
 	{"Single Player", 0, 1},
 	{"Void Deathmatch", 1, 6},
 	{"Contrib", 7, 6},
 };
 
-level_t defeatindetail2levels[] =
+static level_t defeatindetail2levels[] =
 {
 	{"atac3",	"River Crossing"},
 	{"atac4",	"Canyon Chaos"},
 	{"atac7",	"Desert Stormer"},
 };
 
-episode_t defeatindetail2episodes[] =
+static episode_t defeatindetail2episodes[] =
 {
 	{"ATAC Campaign", 0, 3},
 };
 
-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, 11};
-gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
-gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
-gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
-gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
+static level_t prydonlevels[] =
+{
+	{"curig2", "Capel Curig"},	// 0
+
+	{"tdastart", "Gateway"},				// 1
+};
+
+static episode_t prydonepisodes[] =
+{
+	{"Prydon Gate", 0, 1},
+	{"The Dark Age", 1, 1}
+};
+
+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
 {
@@ -3831,7 +3891,7 @@ typedef struct gameinfo_s
 }
 gameinfo_t;
 
-gameinfo_t gamelist[] =
+static gameinfo_t gamelist[] =
 {
 	{GAME_NORMAL, &sharewarequakegame, &registeredquakegame},
 	{GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame},
@@ -3842,24 +3902,33 @@ gameinfo_t gamelist[] =
 	{GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
 	{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
 	{GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
-	{(gamemode_t)-1, &sharewarequakegame, &registeredquakegame} // final fallback
+	{GAME_PRYDON, &prydongame, &prydongame},
+	{GAME_NORMAL, NULL, NULL} // terminator
 };
 
-gamelevels_t *lookupgameinfo(void)
+static gamelevels_t *lookupgameinfo(void)
 {
-	int i;
-	for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++);
+	int i = 0;
+	while (gamelist[i].gameid != gamemode)
+	{
+		if (gamelist[i].notregistered == NULL)
+		{
+			i = 0;
+			break;
+		}
+		i++;
+	}
 	if (registered.integer)
 		return gamelist[i].registered;
 	else
 		return gamelist[i].notregistered;
 }
 
-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)
 {
@@ -3873,9 +3942,9 @@ void M_Menu_GameOptions_f (void)
 }
 
 
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
+static int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
 #define	NUM_GAMEOPTIONS	12
-int		gameoptions_cursor;
+static int		gameoptions_cursor;
 
 void M_GameOptions_Draw (void)
 {
@@ -3886,7 +3955,7 @@ void M_GameOptions_Draw (void)
 	M_Background(320, 200);
 
 	M_DrawPic (16, 4, "gfx/qplaque");
-	p = Draw_CachePic ("gfx/p_multi", false);
+	p = Draw_CachePic ("gfx/p_multi", true);
 	M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
 
 	M_DrawTextBox (152, 32, 10, 1);
@@ -4041,7 +4110,7 @@ void M_GameOptions_Draw (void)
 }
 
 
-void M_NetStart_Change (int dir)
+static void M_NetStart_Change (int dir)
 {
 	gamelevels_t *g;
 	int count;
@@ -4169,8 +4238,6 @@ void M_NetStart_Change (int dir)
 
 	case 8:
 		Cvar_SetValueQuick (&sv_maxrate, sv_maxrate.integer + dir*500);
-		if (sv_maxrate.integer > NET_MAXRATE)
-			Cvar_SetValueQuick (&sv_maxrate, NET_MAXRATE);
 		if (sv_maxrate.integer < NET_MINRATE)
 			Cvar_SetValueQuick (&sv_maxrate, NET_MINRATE);
 		break;
@@ -4206,7 +4273,7 @@ void M_NetStart_Change (int dir)
 	}
 }
 
-void M_GameOptions_Key (int key, char ascii)
+static void M_GameOptions_Key (int key, char ascii)
 {
 	gamelevels_t *g;
 	int l;
@@ -4296,7 +4363,7 @@ void M_GameOptions_Key (int key, char ascii)
 //=============================================================================
 /* SLIST MENU */
 
-int slist_cursor;
+static int slist_cursor;
 
 void M_Menu_ServerList_f (void)
 {
@@ -4305,11 +4372,14 @@ void M_Menu_ServerList_f (void)
 	m_entersound = true;
 	slist_cursor = 0;
 	M_Update_Return_Reason("");
-	Net_Slist_f();
+	if (lanConfig_cursor == 2)
+		Net_SlistQW_f();
+	else
+		Net_Slist_f();
 }
 
 
-void M_ServerList_Draw (void)
+static void M_ServerList_Draw (void)
 {
 	int n, y, visible, start, end;
 	cachepic_t *p;
@@ -4326,11 +4396,11 @@ void M_ServerList_Draw (void)
 	if (*m_return_reason)
 		M_Print(16, menu_height - 8, m_return_reason);
 	y = 48;
-	visible = (menu_height - 16 - y) / 8 / 2;
+	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", false);
+	p = Draw_CachePic("gfx/p_multi", true);
 	M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
 	if (end > start)
 	{
@@ -4341,17 +4411,24 @@ void M_ServerList_Draw (void)
 			M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
 		}
 	}
-	else if (realtime - masterquerytime < 3)
+	else if (realtime - masterquerytime > 10)
 	{
 		if (masterquerycount)
 			M_Print(0, y, "No servers found");
 		else
 			M_Print(0, y, "No master servers found (network problem?)");
 	}
+	else
+	{
+		if (serverquerycount)
+			M_Print(0, y, "Querying servers");
+		else
+			M_Print(0, y, "Querying master servers");
+	}
 }
 
 
-void M_ServerList_Key(int k, char ascii)
+static void M_ServerList_Key(int k, char ascii)
 {
 	switch (k)
 	{
@@ -4360,7 +4437,10 @@ void M_ServerList_Key(int k, char ascii)
 		break;
 
 	case K_SPACE:
-		Net_Slist_f();
+		if (lanConfig_cursor == 2)
+			Net_SlistQW_f();
+		else
+			Net_Slist_f();
 		break;
 
 	case K_UPARROW:
@@ -4394,10 +4474,10 @@ void M_ServerList_Key(int k, char ascii)
 //=============================================================================
 /* Menu Subsystem */
 
-void M_Keydown(int key, char ascii);
-void M_Draw(void);
+static void M_KeyEvent(int key, char ascii, qboolean downevent);
+static void M_Draw(void);
 void M_ToggleMenu_f(void);
-void M_Shutdown(void);
+static void M_Shutdown(void);
 
 void M_Init (void)
 {
@@ -4584,7 +4664,7 @@ void M_Draw (void)
 		break;
 	}
 
-	if (gamemode == GAME_TRANSFUSION) {
+	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;
@@ -4593,10 +4673,10 @@ void M_Draw (void)
 			g = (int)(realtime * 64)%96;
 			scale_y_rate = (float)(g+1) / 96;
 			top_offset = (g+12)/12;
-			p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), false);
-			drop1 = Draw_CachePic("gfx/menu/blooddrop1", false);
-			drop2 = Draw_CachePic("gfx/menu/blooddrop2", false);
-			drop3 = Draw_CachePic("gfx/menu/blooddrop3", false);
+			p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), true);
+			drop1 = Draw_CachePic("gfx/menu/blooddrop1", true);
+			drop2 = Draw_CachePic("gfx/menu/blooddrop2", true);
+			drop3 = Draw_CachePic("gfx/menu/blooddrop3", true);
 			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);
@@ -4611,7 +4691,7 @@ void M_Draw (void)
 					DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0);
 					DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop2, 0, 0, 1, 1, 1, 1, 0);
 				}
-				DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), false), 0, 0, 1, 1, 1, 1, 0);
+				DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), true), 0, 0, 1, 1, 1, 1, 0);
 			}
 		}
 	}
@@ -4626,8 +4706,10 @@ void M_Draw (void)
 }
 
 
-void M_Keydown (int key, char ascii)
+void M_KeyEvent (int key, char ascii, qboolean downevent)
 {
+	if (!downevent)
+		return;
 	switch (m_state)
 	{
 	case m_none:
@@ -4736,33 +4818,24 @@ void M_Restart(void)
 
 //============================================================================
 // Menu prog handling
-mfunction_t *PRVM_ED_FindFunction(const char *);
-
-#define M_F_INIT		"m_init"
-#define M_F_KEYDOWN		"m_keydown"
-#define M_F_DRAW		"m_draw"
-// normal menu names (rest)
-#define M_F_TOGGLE		"m_toggle"
-#define M_F_SHUTDOWN	"m_shutdown"
 
 static char *m_required_func[] = {
-M_F_INIT,
-M_F_KEYDOWN,
-M_F_DRAW,
-M_F_TOGGLE,
-M_F_SHUTDOWN,
+"m_init",
+"m_keydown",
+"m_draw",
+"m_toggle",
+"m_shutdown",
 };
 
 #ifdef NG_MENU
-qboolean m_displayed;
+static qboolean m_displayed;
 #endif
 
 static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
 
-static func_t m_draw, m_keydown;
-
 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;
@@ -4795,18 +4868,18 @@ void MP_Error(const char *format, ...)
 	Host_AbortCurrentFrame();
 }
 
-void MP_Keydown (int key, char ascii)
+void MP_KeyEvent (int key, char ascii, qboolean downevent)
 {
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
 	// pass key
 	prog->globals.generic[OFS_PARM0] = (float) key;
 	prog->globals.generic[OFS_PARM1] = (float) ascii;
-	PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n");
+	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;
 }
@@ -4816,10 +4889,7 @@ void MP_Draw (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
-	PRVM_ExecuteProgram(m_draw,"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_draw,"m_draw() required");
 
 	PRVM_End;
 }
@@ -4829,17 +4899,14 @@ void MP_ToggleMenu_f (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
 #ifdef NG_MENU
 	m_displayed = !m_displayed;
 	if( m_displayed )
-		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_DISPLAY) - prog->functions),"");
+		PRVM_ExecuteProgram(prog->funcoffsets.m_display,"m_display() required");
 	else
-		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_HIDE) - prog->functions),"");
+		PRVM_ExecuteProgram(prog->funcoffsets.m_hide,"m_hide() required");
 #else
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
 #endif
 
 	PRVM_End;
@@ -4850,10 +4917,7 @@ void MP_Shutdown (void)
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
-	// set time
-	*prog->time = realtime;
-
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_SHUTDOWN) - prog->functions),"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_shutdown,"m_shutdown() required");
 
 	// reset key_dest
 	key_dest = key_game;
@@ -4894,21 +4958,17 @@ void MP_Init (void)
 	// 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);
+	PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL, 0, NULL);
 
-	// set m_draw and m_keydown
-	m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
-	m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
+	// note: OP_STATE is not supported by menu qc, we don't even try to detect
+	// it here
 
 #ifdef NG_MENU
 	m_displayed = false;
 #endif
 
-	// set time
-	*prog->time = realtime;
-
 	// call the prog init
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),"");
+	PRVM_ExecuteProgram(prog->funcoffsets.m_init,"m_init() required");
 
 	PRVM_End;
 }
@@ -4921,9 +4981,7 @@ void MP_Restart(void)
 //============================================================================
 // Menu router
 
-static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
-
-void (*MR_Keydown) (int key, char ascii);
+void (*MR_KeyEvent) (int key, char ascii, qboolean downevent);
 void (*MR_Draw) (void);
 void (*MR_ToggleMenu_f) (void);
 void (*MR_Shutdown) (void);
@@ -4936,7 +4994,7 @@ void MR_SetRouting(qboolean forceold)
 	if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold)
 	{
 		// set menu router function pointers
-		MR_Keydown = M_Keydown;
+		MR_KeyEvent = M_KeyEvent;
 		MR_Draw = M_Draw;
 		MR_ToggleMenu_f = M_ToggleMenu_f;
 		MR_Shutdown = M_Shutdown;
@@ -4953,7 +5011,7 @@ void MR_SetRouting(qboolean forceold)
 	else
 	{
 		// set menu router function pointers
-		MR_Keydown = MP_Keydown;
+		MR_KeyEvent = MP_KeyEvent;
 		MR_Draw = MP_Draw;
 		MR_ToggleMenu_f = MP_ToggleMenu_f;
 		MR_Shutdown = MP_Shutdown;