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

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6650 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index f3585d60b675b38a177fdd937c3294c0ba2dfa09..d3665ed63d39435b8868e228eca9c279f57f6e5a 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1233,7 +1233,7 @@ void Host_Rate_f(void)
        if (Cmd_Argc() != 2)
        {
                Con_Printf("\"rate\" is \"%i\"\n", cl_rate.integer);
-               Con_Print("rate <500-25000>\n");
+               Con_Print("rate <bytespersecond>\n");
                return;
        }
 
@@ -1241,7 +1241,7 @@ void Host_Rate_f(void)
 
        if (cmd_source == src_command)
        {
-               Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
+               Cvar_SetValue ("_cl_rate", max(NET_MINRATE, rate));
                CL_SetInfo("rate", va("%i", rate), true, false, false, false);
                return;
        }

diff --git a/menu.c b/menu.c
index b59b39a2c79f6bcc16c12ab95c5ad4b403e96a61..7e0b1b22ee2a27ad6225450452ef0df565065c65 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -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;

diff --git a/quakedef.h b/quakedef.h
index cd43b7d0b41c57f156b766243bc6e744de4b9a1f..e0bdf86000a3c5810a22bca6e2abda1ca8412f9a 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -50,7 +50,6 @@ extern char engineversion[128];
 #define MAX_PACKETFRAGMENT 1024                // max length of packet fragment
 #define NET_MAXMESSAGE 65536
 #define NET_MINRATE            1000 // limits "rate" and "sv_maxrate" cvars
-#define NET_MAXRATE            150000 // limits "rate" and "sv_maxrate" cvars
 
 //
 // per-level limits

diff --git a/sv_main.c b/sv_main.c
index 1516b527188c3803518ebd65cbf04aebf18bf035..1205fa0cb2596719b321d83bb12dad4b48aff09b 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -1234,7 +1234,7 @@ void SV_SendClientDatagram (client_t *client)
        else
        {
                // PROTOCOL_DARKPLACES5 and later support packet size limiting of updates
-               maxrate = bound(NET_MINRATE, sv_maxrate.integer, NET_MAXRATE);
+               maxrate = max(NET_MINRATE, sv_maxrate.integer);
                if (sv_maxrate.integer != maxrate)
                        Cvar_SetValueQuick(&sv_maxrate, maxrate);