diff --git a/common/main/multi.h b/common/main/multi.h index e7980da1c..100ab458e 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -62,9 +62,12 @@ extern int multi_protocol; // set and determinate used protocol #define MULTI_PROTO_UDP 1 // UDP protocol // What version of the multiplayer protocol is this? Increment each time something drastic changes in Multiplayer without the version number changes. Can be reset to 0 each time the version of the game changes -#define MULTI_PROTO_VERSION 8 +#define MULTI_PROTO_VERSION 9 // PROTOCOL VARIABLES AND DEFINES - END +// limits for Packets (i.e. positional updates) per sec +#define MIN_PPS 5 +#define MAX_PPS 40 #define MAX_MESSAGE_LEN 35 diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index c2bd12768..80a574b72 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -2927,7 +2927,7 @@ static int net_udp_start_poll( newmenu *menu, d_event *event, void *userdata ) DXX_##VERB##_CHECK("Show enemy names on HUD", opt_show_names, Netgame.ShowEnemyNames) \ DXX_##VERB##_CHECK("No friendly fire (Team, Coop)", opt_ffire, Netgame.NoFriendlyFire) \ DXX_##VERB##_MENU("Set Objects allowed...", opt_setpower) \ - DXX_##VERB##_TEXT("Packets per second (2 - 20)", opt_label_pps) \ + DXX_##VERB##_TEXT(packdesc, opt_label_pps) \ DXX_##VERB##_INPUT(packstring, opt_packets, 2) \ DXX_##VERB##_TEXT("Network port", opt_label_port) \ DXX_##VERB##_INPUT(UDP_MyPort, opt_port, 5) \ @@ -2958,9 +2958,10 @@ static void net_udp_set_power (void) static void net_udp_more_game_options () { int i; - char PlayText[80],KillText[80],srinvul[50],packstring[5]; + char PlayText[80],KillText[80],srinvul[50],packdesc[30],packstring[5]; newmenu_item m[DXX_UDP_MENU_OPTIONS(COUNT)]; + snprintf(packdesc,sizeof(packdesc),"Packets per second (%i - %i)",MIN_PPS,MAX_PPS); snprintf(packstring,sizeof(packstring),"%d",Netgame.PacketsPerSec); snprintf(srinvul, sizeof(srinvul), "%s: %d %s", TXT_REACTOR_LIFE, Netgame.control_invul_time/F1_0/60, TXT_MINUTES_ABBREV ); snprintf(PlayText, sizeof(PlayText), "Max time: %d %s", Netgame.PlayTimeAllowed*5, TXT_MINUTES_ABBREV ); @@ -2985,16 +2986,16 @@ menu: Netgame.PacketsPerSec=atoi(packstring); - if (Netgame.PacketsPerSec>20) + if (Netgame.PacketsPerSec>MAX_PPS) { - Netgame.PacketsPerSec=20; - nm_messagebox(TXT_ERROR, 1, TXT_OK, "Packet value out of range\nSetting value to 20"); + Netgame.PacketsPerSec=MAX_PPS; + nm_messagebox(TXT_ERROR, 1, TXT_OK, "Packet value out of range\nSetting value to %i",MAX_PPS); } - if (Netgame.PacketsPerSec<2) + if (Netgame.PacketsPerSec 65535)