diff options
| -rw-r--r-- | src/engine/e_config.c | 1 | ||||
| -rw-r--r-- | src/engine/e_config_variables.h | 2 | ||||
| -rw-r--r-- | src/engine/e_console.c | 1 | ||||
| -rw-r--r-- | src/engine/e_if_other.h | 2 | ||||
| -rw-r--r-- | src/engine/e_network.c | 2 | ||||
| -rw-r--r-- | src/engine/server/es_server.c | 2 | ||||
| -rw-r--r-- | src/game/client/components/players.cpp | 1 |
7 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/e_config.c b/src/engine/e_config.c index 426bbd78..1746b682 100644 --- a/src/engine/e_config.c +++ b/src/engine/e_config.c @@ -5,6 +5,7 @@ #include <stdlib.h> #include <base/system.h> +#include "e_if_other.h" #include "e_config.h" #include "e_linereader.h" #include "e_engine.h" diff --git a/src/engine/e_config_variables.h b/src/engine/e_config_variables.h index f4016ddb..1eef9c4e 100644 --- a/src/engine/e_config_variables.h +++ b/src/engine/e_config_variables.h @@ -56,7 +56,7 @@ MACRO_CONFIG_STR(sv_bindaddr, 128, "") MACRO_CONFIG_INT(sv_port, 8303, 0, 0) MACRO_CONFIG_INT(sv_external_port, 0, 0, 0) MACRO_CONFIG_STR(sv_map, 128, "dm1") -MACRO_CONFIG_INT(sv_max_clients, 8, 1, 12) +MACRO_CONFIG_INT(sv_max_clients, 8, 1, MAX_CLIENTS) MACRO_CONFIG_INT(sv_high_bandwidth, 0, 0, 1) MACRO_CONFIG_INT(sv_register, 1, 0, 1) MACRO_CONFIG_STR(sv_rcon_password, 32, "") diff --git a/src/engine/e_console.c b/src/engine/e_console.c index 822d770a..2879e75b 100644 --- a/src/engine/e_console.c +++ b/src/engine/e_console.c @@ -1,4 +1,5 @@ #include <base/system.h> +#include "e_if_other.h" #include "e_console.h" #include "e_config.h" #include "e_linereader.h" diff --git a/src/engine/e_if_other.h b/src/engine/e_if_other.h index d2726a7b..8fc28c54 100644 --- a/src/engine/e_if_other.h +++ b/src/engine/e_if_other.h @@ -12,7 +12,7 @@ enum { SERVER_TICK_SPEED=50, - MAX_CLIENTS=12, + MAX_CLIENTS=16, SNAP_CURRENT=0, SNAP_PREV=1, diff --git a/src/engine/e_network.c b/src/engine/e_network.c index 8f9a24e1..ed9f3405 100644 --- a/src/engine/e_network.c +++ b/src/engine/e_network.c @@ -34,7 +34,7 @@ enum NET_MAX_PACKETSIZE = NET_MAX_PAYLOAD+16, NET_MAX_CHUNKHEADERSIZE = 5, NET_PACKETHEADERSIZE = 3, - NET_MAX_CLIENTS = 16, + NET_MAX_CLIENTS = 128, NET_MAX_SEQUENCE = 1<<10, NET_SEQUENCE_MASK = NET_MAX_SEQUENCE-1, diff --git a/src/engine/server/es_server.c b/src/engine/server/es_server.c index c6ff39c9..3ffc1910 100644 --- a/src/engine/server/es_server.c +++ b/src/engine/server/es_server.c @@ -612,7 +612,7 @@ static void server_process_client_packet(NETCHUNK *packet) { /* OH FUCK! wrong version, drop him */ char reason[256]; - str_format(reason, sizeof(reason), "wrong version. server is running %s.", mods_net_version()); + str_format(reason, sizeof(reason), "wrong version. server is running '%s' and client '%s'.", mods_net_version(), version); netserver_drop(net, cid, reason); return; } diff --git a/src/game/client/components/players.cpp b/src/game/client/components/players.cpp index 43ff3e77..6bf4221e 100644 --- a/src/game/client/components/players.cpp +++ b/src/game/client/components/players.cpp @@ -425,7 +425,6 @@ void PLAYERS::render_player( void PLAYERS::on_render() { - //int num = snap_num_items(SNAP_CURRENT); for(int i = 0; i < MAX_CLIENTS; i++) { // only render active characters |