summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-07-10 07:46:58 +0000
committerrubidium <rubidium@openttd.org>2007-07-10 07:46:58 +0000
commitb1ab5f3e1c7d26f81e3bc26cf733b08882466a60 (patch)
treeea73554e9404d5f8f31138ceb661b6da5ebb8e24
parent400203fb5b75bcad270ac9bf958f13b80c1d1b3b (diff)
downloadopenttd-b1ab5f3e1c7d26f81e3bc26cf733b08882466a60.tar.xz
(svn r10498) -Fix [FS#1008]: remove inconsistency between a warning and the actual behaviour.
-rw-r--r--config.lib6
-rw-r--r--src/network/network.cpp3
2 files changed, 4 insertions, 5 deletions
diff --git a/config.lib b/config.lib
index be7f474a0..32b309f0e 100644
--- a/config.lib
+++ b/config.lib
@@ -697,9 +697,9 @@ check_params() {
log 1 "checking revision... no detection"
log 1 "WARNING: there is no means to determine the version."
log 1 "WARNING: please use a subversion or git checkout of OpenTTD."
- log 1 "WARNING: this version will be allowed by all game servers,"
- log 1 "WARNING: but you will be kicked from all incompatible"
- log 1 "WARNING: servers as you will desync."
+ log 1 "WARNING: this version is only allowed by game servers that"
+ log 1 "WARNING: have been compiled without version detection."
+ log 1 "WARNING: there is a great chance you desync."
log 1 "WARNING: USE WITH CAUTION!"
sleep 5
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 5b7ab937c..afb217ed2 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1470,8 +1470,7 @@ void NetworkShutDown()
bool IsNetworkCompatibleVersion(const char *other)
{
extern const char _openttd_revision[];
- return strncmp(NOREV_STRING, other, NETWORK_REVISION_LENGTH - 1) == 0 ||
- strncmp(_openttd_revision, other, NETWORK_REVISION_LENGTH - 1) == 0;
+ return strncmp(_openttd_revision, other, NETWORK_REVISION_LENGTH - 1) == 0;
}
#ifdef DEBUG_DUMP_COMMANDS