From 08b4255b677259e3e3f9039b903bd5a62a909da6 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sat, 14 Jan 2017 18:00:02 +0000
Subject: [PATCH] (svn r27731) -Fix (r27730): Missed some sprites which also
 belong into orig_extra.grf

---
 bin/baseset/openttd.grf          | Bin 523136 -> 508098 bytes
 bin/baseset/orig_dos.obg         |   2 +-
 bin/baseset/orig_dos_de.obg      |   2 +-
 bin/baseset/orig_extra.grf       | Bin 303149 -> 318212 bytes
 bin/baseset/orig_win.obg         |   2 +-
 media/extra_grf/canals.nfo       |  94 +---------------------------
 media/extra_grf/canals_extra.nfo | 101 +++++++++++++++++++++++++++++++
 media/extra_grf/orig_extra.nfo   |   1 +
 8 files changed, 106 insertions(+), 96 deletions(-)
 create mode 100644 media/extra_grf/canals_extra.nfo

diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf
index 6f2921f272a89628f47f34f5155b5e4b4ada42d7..168d00fbd858c29245a6d8f029e5f9d342502cb7 100644
GIT binary patch
delta 55
zcmZqpE`O*|o`r?se}5xOD+^;Q3)5B><~4H}C8uwk%PhV9%3S8t&F!HvEI`Z(#BAF`
JW7xIl0{|>$6SM#T

delta 7779
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

diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg
index 6d721825a8..ad3b35c49f 100644
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -76,7 +76,7 @@ TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF          = ed446637e034104c5559b32c18afe78d
 TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-ORIG_EXTRA.GRF    = 2f214be226d04af78c3afb961ccdd08d
+ORIG_EXTRA.GRF    = 73b921a42814c47a84945b7e9add5d9f
 
 [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 51b5353952..676840f788 100644
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -75,7 +75,7 @@ TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF          = ed446637e034104c5559b32c18afe78d
 TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-ORIG_EXTRA.GRF    = 2f214be226d04af78c3afb961ccdd08d
+ORIG_EXTRA.GRF    = 73b921a42814c47a84945b7e9add5d9f
 
 [origin]
 default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_extra.grf b/bin/baseset/orig_extra.grf
index 32d2cf627df6182086eeb6a97c1b11816e3b326e..168c415a5dc5e60920059e5da19d5fb61e490ef4 100644
GIT binary patch
delta 15217
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

delta 36
rcmZqKCcO555GxDA|6?qTtgWn!TUnWAM6{PoW&&d7?In|0Cb$Ct@S_bD

diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg
index fc4740fbac..049a3dca9b 100644
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -76,7 +76,7 @@ TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-ORIG_EXTRA.GRF    = 2f214be226d04af78c3afb961ccdd08d
+ORIG_EXTRA.GRF    = 73b921a42814c47a84945b7e9add5d9f
 
 [origin]
 default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/media/extra_grf/canals.nfo b/media/extra_grf/canals.nfo
index c0d0275f35..e464762ee6 100644
--- a/media/extra_grf/canals.nfo
+++ b/media/extra_grf/canals.nfo
@@ -6,7 +6,7 @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Canal graphics by George / PaulC"
+   -1 * 0	 0C "Canal graphics by George"
    -1 * 3	 05 08 41
 // Canal slopes
    -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
@@ -77,95 +77,3 @@
    -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
 // Canal icon
    -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal
-
-// Differentiation for the climates starts here
-
-// Canal edges (arctic snowy)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
-   -1 * 7        02 05 10 01 00 00 00
-
-// Canal edges (arctic normal)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
-   -1 * 7        02 05 11 01 00 00 00
-// Choose the right arctic canal edges
-   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
-   -1 * 6        07 83 01 \7! 01 01
-   -1 * 7        03 05 01 02 00 12 00
-
-// Canal edges (tropic desert)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
-   -1 * 7        02 05 13 01 00 00 00
-
-// Canal edges (tropic rainforest)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
-   -1 * 7        02 05 14 01 00 00 00
-// Choose the right tropic canal edges
-   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
-   -1 * 6        07 83 01 \7! 02 01
-   -1 * 7        03 05 01 02 00 15 00
-
-// Canal edges (toyland)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
-   -1 * 7        02 05 16 01 00 00 00
-   -1 * 6        07 83 01 \7! 03 01
-   -1 * 7        03 05 01 02 00 16 00
diff --git a/media/extra_grf/canals_extra.nfo b/media/extra_grf/canals_extra.nfo
new file mode 100644
index 0000000000..3103886233
--- /dev/null
+++ b/media/extra_grf/canals_extra.nfo
@@ -0,0 +1,101 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+   -1 * 0	 0C "Extra canal graphics by PaulC"
+
+// Differentiation for the climates starts here
+
+// Canal edges (arctic snowy)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
+   -1 * 7        02 05 10 01 00 00 00
+
+// Canal edges (arctic normal)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
+   -1 * 7        02 05 11 01 00 00 00
+// Choose the right arctic canal edges
+   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
+   -1 * 6        07 83 01 \7! 01 01
+   -1 * 7        03 05 01 02 00 12 00
+
+// Canal edges (tropic desert)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
+   -1 * 7        02 05 13 01 00 00 00
+
+// Canal edges (tropic rainforest)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
+   -1 * 7        02 05 14 01 00 00 00
+// Choose the right tropic canal edges
+   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
+   -1 * 6        07 83 01 \7! 02 01
+   -1 * 7        03 05 01 02 00 15 00
+
+// Canal edges (toyland)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
+   -1 * 7        02 05 16 01 00 00 00
+   -1 * 6        07 83 01 \7! 03 01
+   -1 * 7        03 05 01 02 00 16 00
diff --git a/media/extra_grf/orig_extra.nfo b/media/extra_grf/orig_extra.nfo
index 228aa2841c..03a8ff6741 100644
--- a/media/extra_grf/orig_extra.nfo
+++ b/media/extra_grf/orig_extra.nfo
@@ -77,6 +77,7 @@
 //
 #include "shore.nfo"
 #include "fix_graphics.nfo"
+#include "canals_extra.nfo"
 #include "rivers/rapids.nfo"
 #include "rivers/temperate.nfo"
 #include "rivers/arctic.nfo"