X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=864dcbbb9ebafa02352c6b480feb6d1890668980;hb=346a62627336fb1f89c9342b4d32b154b1338c1a;hp=8067e63f5f7f4d9f62c0b2a219870f7039d444db;hpb=1dc239f97a1e99a72d17de824029d3c95664669b;p=xonotic%2Fdarkplaces.git

diff --git a/menu.c b/menu.c
index 8067e63f..864dcbbb 100644
--- a/menu.c
+++ b/menu.c
@@ -107,7 +107,7 @@ 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)
@@ -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);
@@ -279,14 +279,14 @@ void M_ToggleMenu(int mode)
 
 	if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
 	{
-		if(mode == 1)
-			return;
+		if(mode == 0)
+			return; // the menu is off, and we want it off
 		M_Menu_Main_f ();
 	}
 	else
 	{
-		if(mode == 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)
-{
-	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)
+static void M_UnbindCommand (const 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]);
@@ -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)
 			{
@@ -5046,7 +5029,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",