diff options
| author | darkvater <darkvater@openttd.org> | 2004-12-15 00:31:08 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2004-12-15 00:31:08 +0000 |
| commit | c58549d512495568afcc2a6a8ecef8325c4aac33 (patch) | |
| tree | abede9dde98130661ade81d3386600bcf406e07b /network_server.c | |
| parent | 6cb53e7d34b75ba4c2938dbb623ba100c74c0798 (diff) | |
| download | openttd-c58549d512495568afcc2a6a8ecef8325c4aac33.tar.xz | |
(svn r1093) -Fix: Hopefully fixed windows revision issues once and for all. Removed globalness of _openttd_revision and put all such ifdefs into one place. If server has a revision only the same revisions can join; if the server has no revision everyone can join. I reckon this should be a server-side option to allow people to join or not to join.
Diffstat (limited to 'network_server.c')
| -rw-r--r-- | network_server.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/network_server.c b/network_server.c index cc0b6b452..c7f1cb16a 100644 --- a/network_server.c +++ b/network_server.c @@ -563,6 +563,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMPANY_INFO) SEND_COMMAND(PACKET_SERVER_COMPANY_INFO)(cs); } +extern const char _openttd_revision[]; + DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN) { char name[NETWORK_NAME_LENGTH]; @@ -576,10 +578,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN) NetworkRecv_string(p, client_revision, sizeof(client_revision)); - // Too bad, when WITH_REV is disabled, we can not compare the version. -#if defined(WITH_REV) - // Check if the client has WITH_REV enabled - if (strncmp("norev000", client_revision, sizeof(client_revision)) != 0) { + // Check if the client has revision control enabled + if (strncmp(NOREV_STRING, client_revision, sizeof(client_revision)) != 0) { if (strncmp(_network_game_info.server_revision, client_revision, sizeof(_network_game_info.server_revision) - 1) != 0) { // Different revisions!! SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_REVISION); @@ -587,7 +587,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN) return; } } -#endif NetworkRecv_string(p, name, sizeof(name)); playas = NetworkRecv_uint8(p); |