removed NET_MAXRATE (as it served no useful purpose), changed description of rate...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index bbe8869983bad47ed676c53ddfc94180f8578397..7e0b1b22ee2a27ad6225450452ef0df565065c65 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -880,7 +880,7 @@ static 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);
@@ -1299,7 +1299,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;
@@ -2647,7 +2647,7 @@ static 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;
@@ -3298,7 +3298,7 @@ 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("");
 }
@@ -3464,7 +3464,7 @@ static 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);
 }
 
 //=============================================================================
@@ -4230,8 +4230,6 @@ static 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;