X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=90a85ba68cd71e6d30a54edf0c467b9bc88cd50a;hb=ef6014027abab4b524993e33b2698426d259804a;hp=9b17c584b76b6d4977076ffeb1efd907ff08d868;hpb=e888f3e74c64c1d3bdbc603b4d95a7a513a750ea;p=xonotic%2Fdarkplaces.git

diff --git a/menu.c b/menu.c
index 9b17c584..90a85ba6 100644
--- a/menu.c
+++ b/menu.c
@@ -33,7 +33,7 @@ static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu inste
 static int NehGameType;
 
 enum m_state_e m_state;
-char m_return_reason[32];
+char m_return_reason[128];
 
 void M_Menu_Main_f (void);
 	void M_Menu_SinglePlayer_f (void);
@@ -107,11 +107,11 @@ 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(char *s)
+void M_Update_Return_Reason(const char *s)
 {
 	strlcpy(m_return_reason, s, sizeof(m_return_reason));
 	if (s)
-		Con_Printf("%s\n", s);
+		Con_DPrintf("%s\n", s);
 }
 
 #define StartingGame	(m_multiplayer_cursor == 1)
@@ -121,8 +121,8 @@ void M_Update_Return_Reason(char *s)
 #define NumberOfNehahraDemos 34
 typedef struct nehahrademonames_s
 {
-	char *name;
-	char *desc;
+	const char *name;
+	const char *desc;
 } nehahrademonames_t;
 
 static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
@@ -167,8 +167,8 @@ static float menu_x, menu_y, menu_width, menu_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);
+	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);
@@ -187,30 +187,30 @@ static void M_DrawCharacter (float cx, float cy, int num)
 	char temp[2];
 	temp[0] = num;
 	temp[1] = 0;
-	DrawQ_String_Font(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+	DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 }
 
 static void M_PrintColored(float cx, float cy, const char *str)
 {
-	DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
 }
 
 static void M_Print(float cx, float cy, const char *str)
 {
-	DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 }
 
 static void M_PrintRed(float cx, float cy, const char *str)
 {
-	DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
+	DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
 }
 
 static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
 {
 	if (unghosted)
-		DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
 	else
-		DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
+		DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
 }
 
 static void M_DrawPic(float cx, float cy, const char *picname)
@@ -270,23 +270,23 @@ static 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 && key_dest != key_menu_grabbed) || m_state != m_main)
 	{
-		if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1"))
-			return;
+		if(mode == 0)
+			return; // the menu is off, and we want it off
 		M_Menu_Main_f ();
 	}
 	else
 	{
-		if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0"))
-			return;
+		if(mode == 1)
+			return; // the menu is on, and we want it on
 		key_dest = key_game;
 		m_state = m_none;
 	}
@@ -817,12 +817,13 @@ static int		loadable[MAX_SAVEGAMES];
 
 static void M_ScanSaves (void)
 {
-	int		i, j, len;
+	int		i, j;
+	size_t	len;
 	char	name[MAX_OSPATH];
 	char	buf[SAVEGAME_COMMENT_LENGTH + 256];
 	const char *t;
 	qfile_t	*f;
-	int		version;
+//	int		version;
 
 	for (i=0 ; i<MAX_SAVEGAMES ; i++)
 	{
@@ -834,11 +835,12 @@ static void M_ScanSaves (void)
 			continue;
 		// read enough to get the comment
 		len = FS_Read(f, buf, sizeof(buf) - 1);
-		buf[sizeof(buf) - 1] = 0;
+		len = min(len, sizeof(buf)-1);
+		buf[len] = 0;
 		t = buf;
 		// version
 		COM_ParseToken_Simple(&t, false, false);
-		version = atoi(com_token);
+		//version = atoi(com_token);
 		// description
 		COM_ParseToken_Simple(&t, false, false);
 		strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
@@ -865,10 +867,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 (!cl.islocalgame)
 		return;
+#endif
 	m_entersound = true;
 	m_state = m_save;
 	key_dest = key_menu;
@@ -1258,7 +1266,7 @@ static unsigned int *menuplyr_translated;
 typedef struct ratetable_s
 {
 	int rate;
-	char *name;
+	const char *name;
 }
 ratetable_t;
 
@@ -2307,7 +2315,7 @@ static void M_Options_ColorControl_Key (int k, int ascii)
 //=============================================================================
 /* KEYS MENU */
 
-static char *quakebindnames[][2] =
+static const char *quakebindnames[][2] =
 {
 {"+attack", 		"attack"},
 {"impulse 10", 		"next weapon"},
@@ -2330,7 +2338,7 @@ static char *quakebindnames[][2] =
 {"+movedown",		"swim down"}
 };
 
-static char *transfusionbindnames[][2] =
+static const char *transfusionbindnames[][2] =
 {
 {"",				"Movement"},		// Movement commands
 {"+forward", 		"walk forward"},
@@ -2388,7 +2396,7 @@ static char *transfusionbindnames[][2] =
 {"impulse 79",		"taunt 9"}
 };
 
-static char *goodvsbad2bindnames[][2] =
+static const char *goodvsbad2bindnames[][2] =
 {
 {"impulse 69",		"Power 1"},
 {"impulse 70",		"Power 2"},
@@ -2412,7 +2420,7 @@ static char *goodvsbad2bindnames[][2] =
 };
 
 static int numcommands;
-static char *(*bindnames)[2];
+static const char *(*bindnames)[2];
 
 /*
 typedef struct binditem_s
@@ -2517,35 +2525,10 @@ void M_Menu_Keys_f (void)
 
 #define NUMKEYS 5
 
-void M_FindKeysForCommand (const char *command, int *keys)
+static void M_UnbindCommand (const char *command)
 {
-	int		count;
 	int		j;
-	char	*b;
-
-	for (j = 0;j < NUMKEYS;j++)
-		keys[j] = -1;
-
-	count = 0;
-
-	for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
-	{
-		b = keybindings[0][j];
-		if (!b)
-			continue;
-		if (!strcmp (b, command) )
-		{
-			keys[count++] = j;
-			if (count == NUMKEYS)
-				break;
-		}
-	}
-}
-
-static void M_UnbindCommand (char *command)
-{
-	int		j;
-	char	*b;
+	const char	*b;
 
 	for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
 	{
@@ -2591,7 +2574,7 @@ static void M_Keys_Draw (void)
 		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)
@@ -2672,7 +2655,7 @@ static void M_Keys_Key (int k, int ascii)
 		break;
 
 	case K_ENTER:		// go into bind mode
-		M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
+		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]);
@@ -2918,19 +2901,19 @@ static void M_Video_Draw (void)
 	t++;
 
 	// Vertical Sync
-	M_ItemPrint(16, video_cursor_table[t], "         Vertical Sync", gl_videosyncavailable);
+	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", gl_support_anisotropy);
-	M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
+	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", gl_support_texture_compression);
+	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++;
 
@@ -2978,7 +2961,7 @@ static void M_Menu_Video_AdjustSliders (int dir)
 	else if (video_cursor == t++)
 		Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
 	else if (video_cursor == t++)
-		Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy));
+		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++)
@@ -3124,12 +3107,12 @@ static void M_Credits_Key (int key, int ascii)
 //=============================================================================
 /* QUIT MENU */
 
-static char *m_quit_message[9];
+static const char *m_quit_message[9];
 static int		m_quit_prevstate;
 static qboolean	wasInMenus;
 
 
-static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
+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)
 {
 	m_quit_message[0] = line1;
 	m_quit_message[1] = line2;
@@ -3309,8 +3292,8 @@ static void M_LanConfig_Draw (void)
 {
 	cachepic_t	*p;
 	int		basex;
-	char	*startJoin;
-	char	*protocol;
+	const char	*startJoin;
+	const char	*protocol;
 
 	M_Background(320, 200);
 
@@ -3473,20 +3456,20 @@ static void M_LanConfig_Key (int key, int ascii)
 
 typedef struct level_s
 {
-	char	*name;
-	char	*description;
+	const char	*name;
+	const char	*description;
 } level_t;
 
 typedef struct episode_s
 {
-	char	*description;
+	const char	*description;
 	int		firstLevel;
 	int		levels;
 } episode_t;
 
 typedef struct gamelevels_s
 {
-	char *gamename;
+	const char *gamename;
 	level_t *levels;
 	episode_t *episodes;
 	int numepisodes;
@@ -3993,7 +3976,7 @@ void M_GameOptions_Draw (void)
 		M_Print(0, 72, "        Teamplay");
 		if (gamemode == GAME_ROGUE)
 		{
-			char *msg;
+			const char *msg;
 
 			switch((int)teamplay.integer)
 			{
@@ -4009,7 +3992,7 @@ void M_GameOptions_Draw (void)
 		}
 		else
 		{
-			char *msg;
+			const char *msg;
 
 			switch (teamplay.integer)
 			{
@@ -4400,9 +4383,10 @@ static void M_ServerList_Draw (void)
 	{
 		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, serverlist_viewlist[n]->line1);y += 8;
-			M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
+			M_PrintColored(0, y, entry->line1);y += 8;
+			M_PrintColored(0, y, entry->line2);y += 8;
 		}
 	}
 	else if (realtime - masterquerytime > 10)
@@ -4456,7 +4440,7 @@ static void M_ServerList_Key(int k, int ascii)
 	case K_ENTER:
 		S_LocalSound ("sound/misc/menu2.wav");
 		if (serverlist_viewcount)
-			Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
+			Cbuf_AddText(va("connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname));
 		break;
 
 	default:
@@ -4486,7 +4470,6 @@ typedef struct modlist_entry_s
 static int modlist_cursor;
 //static int modlist_viewcount;
 
-#define MODLIST_TOTALSIZE		256
 static int modlist_count = 0;
 static modlist_entry_t modlist[MODLIST_TOTALSIZE];
 
@@ -4694,7 +4677,7 @@ static void M_ModList_Key(int k, int ascii)
 
 static void M_KeyEvent(int key, int ascii, qboolean downevent);
 static void M_Draw(void);
-void M_ToggleMenu_f(void);
+void M_ToggleMenu(int mode);
 static void M_Shutdown(void);
 
 void M_Init (void)
@@ -5033,6 +5016,10 @@ void M_KeyEvent (int key, int ascii, qboolean downevent)
 
 }
 
+void M_NewMap(void)
+{
+}
+
 void M_Shutdown(void)
 {
 	// reset key_dest
@@ -5046,7 +5033,7 @@ void M_Restart(void)
 //============================================================================
 // Menu prog handling
 
-static char *m_required_func[] = {
+static const char *m_required_func[] = {
 "m_init",
 "m_keydown",
 "m_draw",
@@ -5142,16 +5129,26 @@ void MP_Draw (void)
 	R_SelectScene( RST_CLIENT );
 }
 
-void MP_ToggleMenu_f (void)
+void MP_ToggleMenu(int mode)
 {
 	PRVM_Begin;
 	PRVM_SetProg(PRVM_MENUPROG);
 
+	prog->globals.generic[OFS_PARM0] = (float) mode;
 	PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
 
 	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;
@@ -5212,8 +5209,9 @@ void MP_Restart(void)
 
 void (*MR_KeyEvent) (int key, int ascii, qboolean downevent);
 void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
+void (*MR_ToggleMenu) (int mode);
 void (*MR_Shutdown) (void);
+void (*MR_NewMap) (void);
 
 void MR_SetRouting(qboolean forceold)
 {
@@ -5225,8 +5223,9 @@ void MR_SetRouting(qboolean forceold)
 		// set menu router function pointers
 		MR_KeyEvent = M_KeyEvent;
 		MR_Draw = M_Draw;
-		MR_ToggleMenu_f = M_ToggleMenu_f;
+		MR_ToggleMenu = M_ToggleMenu;
 		MR_Shutdown = M_Shutdown;
+		MR_NewMap = M_NewMap;
 
 		// init
 		if(!m_init)
@@ -5242,8 +5241,9 @@ void MR_SetRouting(qboolean forceold)
 		// set menu router function pointers
 		MR_KeyEvent = MP_KeyEvent;
 		MR_Draw = MP_Draw;
-		MR_ToggleMenu_f = MP_ToggleMenu_f;
+		MR_ToggleMenu = MP_ToggleMenu;
 		MR_Shutdown = MP_Shutdown;
+		MR_NewMap = MP_NewMap;
 
 		if(!mp_init)
 		{
@@ -5263,9 +5263,11 @@ void MR_Restart(void)
 
 void Call_MR_ToggleMenu_f(void)
 {
+	int m;
+	m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1)));
 	Host_StartVideo();
-	if(MR_ToggleMenu_f)
-		MR_ToggleMenu_f();
+	if(MR_ToggleMenu)
+		MR_ToggleMenu(m);
 }
 
 void MR_Init_Commands(void)