From 589aad0990fa6ed7d3343c1e167f044020881ece Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 6 Apr 2014 22:58:59 +0300
Subject: [PATCH] More fixes to version string to match official release.

Why did they made it so complicated?
---
 findversion.sh | 12 ++++++------
 src/rev.cpp.in |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/findversion.sh b/findversion.sh
index 9d8a5ae5a1..5c0da20382 100755
--- a/findversion.sh
+++ b/findversion.sh
@@ -58,12 +58,6 @@ EOF
 exit 1;
 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.
 if [ -z "$AWK" ]; then
 	AWK=awk
@@ -73,6 +67,12 @@ fi
 cd `dirname "$0"`
 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
 # Assume the dir is not modified
 MODIFIED="0"
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 330066464a..f2c5d505d4 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rev.cpp.in 26440 2014-04-01 18:33:16Z frosch $ */
 
 /*
  * 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
  * 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__
 /**