(svn r1098) -Fix: server without revision build doesn't care about the client's version. Also moved all revision things where it belongs (network.c)
--- a/network.c Wed Dec 15 15:19:51 2004 +0000
+++ b/network.c Wed Dec 15 16:51:55 2004 +0000
@@ -1,6 +1,16 @@
#include "stdafx.h"
#include "network_data.h"
+#if defined(WITH_REV)
+ extern const char _openttd_revision[];
+#elif defined(WITH_REV_HACK)
+ #define WITH_REV
+ const char _openttd_revision[] = WITH_REV_HACK;
+#else
+ const char _openttd_revision[] = NOREV_STRING;
+#endif
+
+
#ifdef ENABLE_NETWORK
#include "table/strings.h"
--- a/network.h Wed Dec 15 15:19:51 2004 +0000
+++ b/network.h Wed Dec 15 16:51:55 2004 +0000
@@ -2,6 +2,7 @@
#define NETWORK_H
#include "network_core.h"
+#define NOREV_STRING "norev000"
#ifdef ENABLE_NETWORK
--- a/network_server.c Wed Dec 15 15:19:51 2004 +0000
+++ b/network_server.c Wed Dec 15 16:51:55 2004 +0000
@@ -578,6 +578,7 @@
NetworkRecv_string(p, client_revision, sizeof(client_revision));
+#ifdef WITH_REV
// 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) {
@@ -587,6 +588,7 @@
return;
}
}
+#endif
NetworkRecv_string(p, name, sizeof(name));
playas = NetworkRecv_uint8(p);
--- a/strings.c Wed Dec 15 15:19:51 2004 +0000
+++ b/strings.c Wed Dec 15 16:51:55 2004 +0000
@@ -20,13 +20,7 @@
static uint _langtab_num[32]; // Offset into langpack offs
static uint _langtab_start[32]; // Offset into langpack offs
-#if defined(WITH_REV)
- extern const char _openttd_revision[];
-#elif defined(WITH_REV_HACK)
- const char _openttd_revision[] = WITH_REV_HACK;
-#else
- const char _openttd_revision[] = NOREV_STRING;
-#endif
+extern const char _openttd_revision[];
typedef byte *PlayerNameGeneratorProc(byte *buffr);
--- a/ttd.h Wed Dec 15 15:19:51 2004 +0000
+++ b/ttd.h Wed Dec 15 16:51:55 2004 +0000
@@ -1,7 +1,6 @@
#ifndef TTD_H
#define TTD_H
-#define NOREV_STRING "norev000"
// FIXME: Include only where really needed.
// include sprites
#include "table/sprites.h"