More fixes to version string to match official release.
Why did they made it so complicated?
This commit is contained in:
@@ -58,12 +58,6 @@ EOF
|
|||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Override version number, to allow OpenTTD with Android modifications to connect to official servers
|
|
||||||
if [ -e version-override ]; then
|
|
||||||
cat version-override
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Allow awk to be provided by the caller.
|
# Allow awk to be provided by the caller.
|
||||||
if [ -z "$AWK" ]; then
|
if [ -z "$AWK" ]; then
|
||||||
AWK=awk
|
AWK=awk
|
||||||
@@ -73,6 +67,12 @@ fi
|
|||||||
cd `dirname "$0"`
|
cd `dirname "$0"`
|
||||||
ROOT_DIR=`pwd`
|
ROOT_DIR=`pwd`
|
||||||
|
|
||||||
|
# Override version number, to allow OpenTTD with Android modifications to connect to official servers
|
||||||
|
if [ -e $ROOT_DIR/version-override ]; then
|
||||||
|
cat $ROOT_DIR/version-override
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
# Determine if we are using a modified version
|
# Determine if we are using a modified version
|
||||||
# Assume the dir is not modified
|
# Assume the dir is not modified
|
||||||
MODIFIED="0"
|
MODIFIED="0"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* $Id$ */
|
/* $Id: rev.cpp.in 26440 2014-04-01 18:33:16Z frosch $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This file is part of OpenTTD.
|
* This file is part of OpenTTD.
|
||||||
@@ -70,7 +70,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
|
|||||||
* final release will always have a lower version number than the released
|
* final release will always have a lower version number than the released
|
||||||
* version, thus making comparisons on specific revisions easy.
|
* version, thus making comparisons on specific revisions easy.
|
||||||
*/
|
*/
|
||||||
const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 24 | 0 << 20 | 1 << 19 | (!!REVISION!! & ((1 << 19) - 1));
|
const uint32 _openttd_newgrf_version = 1 << 28 | 4 << 24 | 0 << 20 | 1 << 19 | (!!REVISION!! & ((1 << 19) - 1));
|
||||||
|
|
||||||
#ifdef __MORPHOS__
|
#ifdef __MORPHOS__
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user