Changeset - r17986:0f8f901991d4
[Not reviewed]
master
0 4 0
rubidium - 13 years ago 2011-08-21 18:57:45
rubidium@openttd.org
(svn r22805) -Codechange: move use of magic number for version checking to more logical location
4 files changed with 14 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/network/network_client.cpp
Show inline comments
 
@@ -381,7 +381,7 @@ NetworkRecvStatus ClientNetworkGameSocke
 
	 * 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;
 
}
src/network/network_server.cpp
Show inline comments
 
@@ -975,7 +975,7 @@ NetworkRecvStatus ServerNetworkGameSocke
 
	 * 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. */
src/rev.cpp.in
Show inline comments
 
@@ -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".
src/rev.h
Show inline comments
 
@@ -17,4 +17,6 @@ extern const char _openttd_build_date[];
 
extern const byte _openttd_revision_modified;
 
extern const uint32 _openttd_newgrf_version;
 

	
 
bool IsReleasedVersion();
 

	
 
#endif /* REV_H */
0 comments (0 inline, 0 general)