diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/client.c | 5 | ||||
| -rw-r--r-- | src/engine/interface.h | 7 | ||||
| -rw-r--r-- | src/engine/server/server.c | 7 | ||||
| -rw-r--r-- | src/engine/versions.h | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/engine/client/client.c b/src/engine/client/client.c index ab4b7109..fe8a7305 100644 --- a/src/engine/client/client.c +++ b/src/engine/client/client.c @@ -9,8 +9,6 @@ #include <engine/interface.h> #include "ui.h" -#include <engine/versions.h> - #include <engine/protocol.h> #include <engine/snapshot.h> #include <engine/compression.h> @@ -152,7 +150,7 @@ static void client_send_info() game_start_time = -1; msg_pack_start_system(NETMSG_INFO, MSGFLAG_VITAL); - msg_pack_string(TEEWARS_NETVERSION_STRING, 64); + msg_pack_string(modc_net_version(), 128); msg_pack_string(config.player_name, 128); msg_pack_string(config.clan_name, 128); msg_pack_string(config.password, 128); @@ -717,6 +715,7 @@ static void client_run(const char *direct_connect_server) // init the mod modc_init(); + dbg_msg("client", "version %s", modc_net_version()); // open socket NETADDR4 bindaddr; diff --git a/src/engine/interface.h b/src/engine/interface.h index 010a393e..a46b826f 100644 --- a/src/engine/interface.h +++ b/src/engine/interface.h @@ -708,6 +708,13 @@ int modmenu_render(int ingame); void modc_message(int msg); void mods_message(int msg, int client_id); +const char *modc_net_version(); +const char *mods_net_version(); + +// unused +// const char *modc_version(); +// const char *mods_version(); + /* server */ int server_getclientinfo(int client_id, CLIENT_INFO *info); int server_tick(); diff --git a/src/engine/server/server.c b/src/engine/server/server.c index b31c2a6c..2c568e07 100644 --- a/src/engine/server/server.c +++ b/src/engine/server/server.c @@ -11,7 +11,6 @@ #include <engine/snapshot.h> #include <engine/compression.h> -#include <engine/versions.h> #include <engine/network.h> #include <engine/config.h> @@ -366,11 +365,11 @@ static void server_process_client_packet(NETPACKET *packet) { char version[64]; strncpy(version, msg_unpack_string(), 64); - if(strcmp(version, TEEWARS_NETVERSION_STRING) != 0) + if(strcmp(version, mods_net_version()) != 0) { // OH FUCK! wrong version, drop him char reason[256]; - sprintf(reason, "wrong version. server is running %s.", TEEWARS_NETVERSION_STRING); + sprintf(reason, "wrong version. server is running %s.", mods_net_version()); netserver_drop(net, cid, reason); return; } @@ -545,6 +544,7 @@ static int server_run() } mods_init(); + dbg_msg("server", "version %s", mods_net_version()); int64 time_per_tick = time_freq()/SERVER_TICK_SPEED; int64 time_per_heartbeat = time_freq() * 30; @@ -657,3 +657,4 @@ int main(int argc, char **argv) server_run(); return 0; } + diff --git a/src/engine/versions.h b/src/engine/versions.h deleted file mode 100644 index 001542e3..00000000 --- a/src/engine/versions.h +++ /dev/null @@ -1,3 +0,0 @@ -#define TEEWARS_NETVERSION 0xffffffff -#define TEEWARS_NETVERSION_STRING "development" -#define TEEWARS_VERSION "development" |