(svn r21251) -Fix (r20950): toyland sprites were forgotten

6 files changed, 21 insertions, 3 deletions

diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
index 7ef7bbb76..3db191700 100644
--- a/bin/data/openttd.grf
+++ b/bin/data/openttd.grf
diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg
index e225dfb98..14e877021 100644
--- a/bin/data/orig_dos.obg
+++ b/bin/data/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 3d2bf2f2c1607c144ef6053e58c6dba9
+OPENTTD.GRF  = 75fe128aa34157413938c90be4608152
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/data/orig_dos_de.obg b/bin/data/orig_dos_de.obg
index 21c77f2af..673596031 100644
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 3d2bf2f2c1607c144ef6053e58c6dba9
+OPENTTD.GRF  = 75fe128aa34157413938c90be4608152
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/data/orig_win.obg b/bin/data/orig_win.obg
index bc303cac8..bd595bc0f 100644
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 3d2bf2f2c1607c144ef6053e58c6dba9
+OPENTTD.GRF  = 75fe128aa34157413938c90be4608152
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/media/extra_grf/fix_graphics.nfo b/media/extra_grf/fix_graphics.nfo
index 6bff9cd43..ca56d37e9 100644
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -132,6 +132,9 @@
 // Graphics metadata pixel higher than actual graphics
    -1 * 6	 12 01 00 01 AC E2
    -1 sprites/fix_graphics.png 66 296 01 10 9 0 0
+
+// Non-toyland specific
+   -1 * 6	 07 83 01 \7= 03 0A
 // Grahpics for the tubular bridge pillars had incorrect offsets
    -1 * 5	 0A 01 04 05 0A
    -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1
@@ -144,3 +147,18 @@
    -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2
    -1 sprites/fix_graphics.png 210 296 09 11 10 -10 -1
    -1 sprites/fix_graphics.png 226 296 09 11 10 -10 -1
+
+// Toyland specific
+   -1 * 6	 07 83 01 \7! 03 0A
+// Grahpics for the toyland tubular bridge pillars had incorrect offsets
+   -1 * 5	 0A 01 04 05 0A
+   -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1
+   -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1
+   -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0
+// Grahpics for the toyland cantilever bridge pillars had incorrect offsets
+   -1 * 5	 0A 01 04 DD 09
+   -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3
+   -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2
+   -1 sprites/fix_graphics.png 360 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 376 296 09 11 10 -10 -1
diff --git a/media/extra_grf/fix_graphics.png b/media/extra_grf/fix_graphics.png
index 0035b9f17..52eb3b798 100644
--- a/media/extra_grf/fix_graphics.png
+++ b/media/extra_grf/fix_graphics.png