Mercurial > hg > openttd
changeset 17996:85a9e67896da draft
(svn r22805) -Codechange: move use of magic number for version checking to more logical location
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sun, 21 Aug 2011 18:57:45 +0000 |
| parents | 4cdf18493a2c |
| children | 807e4762a716 |
| files | src/network/network_client.cpp src/network/network_server.cpp src/rev.cpp.in src/rev.h |
| diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -381,7 +381,7 @@ * branches we make tarballs of the OpenTTDs compiled from tarball * will have the lower bits set to 0. As such they would become * incompatible, which we would like to prevent by this. */ - if (HasBit(_openttd_newgrf_version, 19)) p->Send_uint32(_openttd_newgrf_version); + if (IsReleasedVersion()) p->Send_uint32(_openttd_newgrf_version); my_client->SendPacket(p); return NETWORK_RECV_STATUS_OKAY; }
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -975,7 +975,7 @@ * branches we make tarballs of the OpenTTDs compiled from tarball * will have the lower bits set to 0. As such they would become * incompatible, which we would like to prevent by this. */ - if (HasBit(_openttd_newgrf_version, 19)) { + if (IsReleasedVersion()) { if (_openttd_newgrf_version != p->Recv_uint32()) { /* The version we get from the client differs, it must have the * wrong version. The client must be wrong. */
--- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -10,9 +10,19 @@ /** @file rev.cpp Autogenerated file with the revision and such of OpenTTD. */ #include "stdafx.h" +#include "core/bitmath_func.hpp" #include "rev.h" /** + * Is this version of OpenTTD a release version? + * @return True if it is a release version. + */ +bool IsReleasedVersion() +{ + return HasBit(_openttd_newgrf_version, 19); +} + +/** * The text version of OpenTTD's revision. * This will be either "<major>.<minor>.<build>[-RC<rc>]", * "r<revision number>[M][-<branch>]" or "norev000".