From 8b92707d7ca4a5fb58e216fca64d0b1bf0b722f1 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
zcmcb&%;>=~qlPVvx6U%wPrrSZv7V7}d(=5bbw<Ye>D;Fo4X1BD&*;a<xSjC=<5f|{
z`soYpnf0dYzGPIMuJMdfk4ac#`o_16mfI&jW1PnZkye@h-<6qbdfZ#aKqg_0?Hk`R
zKDA-2pKj2~q&NMj7E>UbVk3`SBlq-!FBw&~J7_b_1X=Z<i%D-fhb~hflU(EWXkDf&
z;SeqLOsb9BH?}hAu`<?Af6&EL&m`QqJ+Yg~N*p9_&a5*1z#^t-CaJ3F8*-Q=x0@|y
zN`x90IQ``kCOszg#&*f2Ozo0OnYT+WWs#L(te-yX5KHp(SqE8Un53Df?>NZv5F%F3
z<iNIF`Y_99CdT^d{Kr`8nRJ=APdLU>4l)qRpFZIjOT%=|lVClsPqH*HGH=g0#Zm)O
z^7<r8J(CCX_N+53S<Db4#HPPK&yvZc%M8+|x4q>8iyk{;{q*^FSn8R=)wY}5U<m=~
z?7YcR&!ot_o$D40CzPK&z5F)Vf!n9vh6sW+$xCimxXV%`z*s+>>pe^Q^j~jTB$%W`
zr;EH}`3e!MXH=LjbC^Y9`=a+O=RwZs|He|zrN-Q-!Q80DtlPN#^Jf+tkR=9RS?Zab
z4W@7W%5s;netQ2mmU<?>#_a;%S<Io*$<tT=V3A?+W8Z%A2aAC|WBv4pZmbE@qcm9M
z8F{x0+OhgGZa=BXDlQ9=sb^x2ZclP&-JaymCg8+aKfSn<t)8h~Wcrs*wmN3Hg%;aO
zyV%%O80)7CK4F!bK7AcqDpNh*^ndF>vYT|a*RN-jl!VFh@UY8FKYxPFlc}D4y3|RK
z5-q{)vrn>Z;DjlezK%_7dd+1vf2Mlg>1Qv4ln7{V_q)ROT$r(by4eem<pR^UzhJ9l
zwqIkm-Qp!%z8Fj|4-dP*^h^KQLYeB>rfRa+G0S;KZC%Cg&W)rXm8qU{dNB`3QdxZa
z7asODE+ko%={v>Q9hvI6rvDKKDcK~wy;g#~g9oBSV!E6vdpgK_?W!QzKN{^EYV7SC
YY8>qxYMkvHYFzCcYTVm7)Of;j0bbKGL;wH)

delta 884
zcmaE`%;?@SqlPVvx6U#$Ouv1Wv3`5>IYxCxMuzEYFEAQT-*TSOZ#(k^#;c-?4AU83
zG6qi9dd8^7q#?9D>KWs8Hb#c&fq6`N(-Yn@1~O>~O^<rUXu18(TgEjuj11FdBboK4
zAJ<|EWNK8{E~U+M5M-)sB(usiU8ZQJM%nGLx=dHXAqs=0x3n_pvNWm~yHCH7$)vUY
zek&6bD?|>Yo@=^5H^?BN?aAFtR^p5d(*<pqRi+<W#1zd`CAnRGF;f+i>0s5$(_b%P
z(qn2=YnNWi)Goc0dAsyd7FiiahUs$-u_RBQbC5-biCJp;u7fNOA!7ARZ1&q_53_t`
z0vUgdrJjjdXL|PumWJs<$63B3#I|>zU`Yho_Vy%810&P+yi+VSaIX9IoHHz0%n;RL
z)8C$F$%GoCx4rEGiyk{8!}NuBSn8S7!nT{;U<m<f?7j)IOJO_DEf!8FKY4oPZLs^c
zPrnTj1Z$F%+pct%rAUC0VLH!ymh|a=-m*wAiAqivd&lw>B394TC_i2PFpK#1CGT0z
zgWNIk8%sHt8grutbE6h>qt5oPpIK}`ws`$uNuECSD~k-1fz$NOUs>)lGEATNjisKc
zk$1b$cNTM~ntCR7-|eS=uo&nwGED!Y&RWkT#k0LugEdtS!cUm)?9M9B6wTD0;?BA~
z#hp#SiIHJ?X(wAflL*7~Z=Gy)%nL1KwwHIYv8ymLOs`+ZR?o!8Fl{|s9rGp~neC11
z*(4<);xf|(c-W<;Up&F)$;8euUFIZP9kZ68%=Wn_**0)Olo(8}yUga##LF=K{AIQ}
zW&v%P?EzQVo(nTFOt*N!R?j5BFn#9>wmRlDX13d{Ub5wjL9~HQ=9_-yKU*jh8^cs>
z_Bv({DVeQn*xk926eKfoGE6V!VXtFW7MI!njfcIB3rSXK`fhP{M<y<Y>Hoyp>zFr5
z%WSWgVDI38D3O@1pvs=k#K$nbQ<c4r`HzN7JC_=JJC_<qJC_<~JC_<)JC_>wb}luZ
Guv`Gh%@g(j

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