From 65ff2c1ce645191f8d49a851d04f14ab133b665a Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 6 Jan 2013 13:01:46 +0000
Subject: [PATCH] (svn r24889) -Fix-ish: extra GRF was built with "broken"
 grfcodec

---
 bin/baseset/openttd.grf     | Bin 824158 -> 824160 bytes
 bin/baseset/orig_dos.obg    |   2 +-
 bin/baseset/orig_dos_de.obg |   2 +-
 bin/baseset/orig_win.obg    |   2 +-
 config.lib                  |  12 ++++++------
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf
index 554a330f534c5c42cf981075fb00665603114398..aebde9bc7876d8714c7407c2331d8b32f83df44f 100644
GIT binary patch
delta 899
zcmYk1TS!z<6o%RR?Ad2-)`;d@w6SQMCT%8@Pz&iwSue&w7f6UqLXsj#LI`Vnpfc^D
zdWb~@g;qXPRCZz2TNXvrZ6pgSGYq;YVm+uOA=x^f5qwx1{`LL;T5Er9FY0SAYP`!n
zzG4b`=wS@Ey=L<nN!JUu815ul1@%}LdpC=Ett+$`L<iVBh<s-;o)LkLA+{7xe`gn@
zg+nm0R&&DkAr>c$guj&$DLl$!@Fbtd<y^xZG+fX*z(TmPfS)y2^|cVSM|qqF4Xljv
zw_B}<;&}#kP}F9b6wffQ>I7frHF=2^f`@Iqk_QgLtv%e2#g}+hYFr!!F7p_lZ#4O@
za4HS`SH$cbik*8Ts^MIx$l=)<-0u`$te)a4C1yVs!<_WYr$X_lhNqs2dUIe(1L;O^
zBqlS13DL+j-1A&Cm==<Xuh+2lrKr`cNEQqx#crBo=3;oHOT=^{7eA46YZ#Zj7n{sv
z^9Ry%HFSOyj+Cy3`ku)H@l21^oDAjqaZaz;@1c<Mm#BfiL&C=cvmo=Q7`1we&4HZ9
z!iR0YMAAIt<Zn^$3~NS2GxD{lfy2Y1%v@49N=w%iLdU4+wQP#dFwpZyl%#MqTpObs
zDs)VYiNZx>`m)Zp1GYtMxhxISm)kZnOf0Z@XIn&Zt+Hunxea%gOV4WR)iq1SRVIuy
z%fni*wG<DuNIgU#{i`hia6|6mY6kqfVba?RQQee&{}gq*^&Ch(lN-3wA&@XF`RRB*
zA#XXREHoes8oK31uF~LDw`uVdV8vVcBZDl({pNBHU_XHs*Nd@qK<>+$%F=ibyqS=j
zxsqoV=oDQaxOY`AcTF?Ubq=U=n{b{NN8I``=QJ9E2VQ*@S56rBnwHzyc*v(8cUu-8
g1oQM7^LtHsCLND7*~2=OoytMwq;jD>?B25XKVH)^L;wH)

delta 884
zcmYk3O-vJE5Qe+oe%+N)NU1_;*#hCGGzBVRf=Dn%JXB5msZop)6HGA#qnMZ&B2ku2
z1Vm0AU@mw-ffI^B%tSo_iGYg5fDu9bxgbO<2U6fb)G14Z!yM*$-+5=g-EZCbU%K<_
z`-SN-!2mO3f{JDDge-xYN8`dS=no3VP#hON#1jz~1V4D@1TS-2@!Xv7Q6lKCW?m={
z34Ve=a4-G}2|dN6IM0e+81^tf(^Aoq%?2W=1T)%lSsBxucs`d+p3&J!xZS{Vxt6ip
z2UAtdgI^mMGj94#U}=d2SuxPUifkmr6^j`#_<)jX?U?eA)ow{&cc;V8PUdBrt0}3A
zQHhw;#hnU`wh!_Ev=4BFi4J%%z`yHEWzv3h4)G-xiGRgaCgwoP2(Jh0FkjhZNbEvn
zTWFNm3k<7Y^PB%$A6|aTFNwN40YX7uwGrdR#&PbIN$L1Z*{)J7nBu1*gDsyTyHe3S
z&7(H@0Nj{azYk$XhwDT3WK5go*DN$-UgVXq7UGF4-VO=Bd01yE(^4R1h}*Dpkq0Ap
z+*{@~CYPwWMa?5>IT&8z#gQ#XR_QCWhG|P)2|Nw+S=~zkF=$=kdp0~OlaJz?Ri3w#
z^tCLb${c3A<u+bS*86fe=rg9!Z)mFU8L`4ASxQK_-YltXhXIzGr8=>rP{EqJlAJ+;
z`j~`RLt8KLz8nR$Ude9PxdIlm?11+p(qSeWKp7>ACr-ipqtcTo-I51&6Vh=OV}RfU
zsg`U7PfSWbwv$>oPr()gJfA0_r(hozEl5`rwj{^G<X`DDlMJoda-Dd{p*-u6ebHMC
z0TxAvn@LQ!DY$Hw8%<l(G<a!~4=|Gf{@BRUm!zPYDBm&bmPAO+lq>0B(40x?np<fy
Uxn!zsR8dqWs%SL1%%xZU0m#i0_5c6?

diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg
index 72e5e52552..5e49a6cfa4 100644
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 891f2dc7c81346d8fd5fbf4cf42dc5bd
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg
index bfa7fe56c1..c14e089450 100644
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 891f2dc7c81346d8fd5fbf4cf42dc5bd
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg
index 8edf60094a..c3febdda0a 100644
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 891f2dc7c81346d8fd5fbf4cf42dc5bd
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/config.lib b/config.lib
index 6f215455aa..2ce1bba982 100644
--- a/config.lib
+++ b/config.lib
@@ -3169,9 +3169,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
-			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
+			log 1 "checking grfcodec... needs at least version 6.0.2 (r949), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3211,9 +3211,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
-			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
+			log 1 "checking nforenum... needs at least version 6.0.2 (r949), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi