From f17546e879108a9fdf28db0f8db30710977a2c91 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 15 Dec 2006 17:38:52 +0000 Subject: [PATCH] removed NET_MAXRATE (as it served no useful purpose), changed description of rate to say bytespersecond instead of 500-25000 (which was wrong, the limit was 1000-150000) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6650 d7cf8633-e32d-0410-b094-e92efae38249 --- host_cmd.c | 4 ++-- menu.c | 2 -- quakedef.h | 1 - sv_main.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/host_cmd.c b/host_cmd.c index f3585d60..d3665ed6 100644 --- 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 \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 b59b39a2..7e0b1b22 100644 --- 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 cd43b7d0..e0bdf860 100644 --- 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 1516b527..1205fa0c 100644 --- 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); -- 2.39.2