diff options
| author | rubidium <rubidium@openttd.org> | 2013-01-06 13:01:46 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2013-01-06 13:01:46 +0000 |
| commit | 65ff2c1ce645191f8d49a851d04f14ab133b665a (patch) | |
| tree | 7dab944b174e7563bc00fc83447548f2d3c8d126 | |
| parent | 283256aaddaedfb1305936dabe8e5f3e8856bc9a (diff) | |
| download | openttd-65ff2c1ce645191f8d49a851d04f14ab133b665a.tar.xz | |
(svn r24889) -Fix-ish: extra GRF was built with "broken" grfcodec
| -rw-r--r-- | bin/baseset/openttd.grf | bin | 824158 -> 824160 bytes | |||
| -rw-r--r-- | bin/baseset/orig_dos.obg | 2 | ||||
| -rw-r--r-- | bin/baseset/orig_dos_de.obg | 2 | ||||
| -rw-r--r-- | bin/baseset/orig_win.obg | 2 | ||||
| -rw-r--r-- | config.lib | 12 |
5 files changed, 9 insertions, 9 deletions
diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf Binary files differindex 554a330f5..aebde9bc7 100644 --- a/bin/baseset/openttd.grf +++ b/bin/baseset/openttd.grf diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg index 72e5e5255..5e49a6cfa 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 bfa7fe56c..c14e08945 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 8edf60094..c3febdda0 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 6f215455a..2ce1bba98 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 |