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!HvEbXB&tnHyO
MY}-R)*tO>a04!z`v;Y7A

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
zcmZ2`K&WM#Fe?kge^J&()>c-=t*lHlBI@NB{`0t2loTZ@Bq!!2<|w2WB^G34CKoFt
zRVoA|mgYFKF#Km^W#oCr%qXVI@b&-y|I7>w3@?~3urZ1(;9VfuA@Rb5RY+J&l%+$z
z!|p&72dllKkf@_GbBBIM&W#RECPr2kRzVSAjt>2f84tGbvM{o-bF#Cs2-`byuy@4O
zcO2*W`TgftRyKAvW+rx)7rjgzoG*GiULR!R{{Hj#_pjf-|6^lid=SUT`d|+ud&ldU
zs_Z|0{rLHvk@-a&GZQ28gSd{@ok1Lbe|-J<gO!=_MgIf+7q2_^bT+a6`Tq6C&j&A=
znb<iWyk_DI?)03viT&T#?>~RAv%ZvOW@Ti4S;15v653hODarWzrSuCeW@dKQ8+#Z-
z9(s1Mu2NwA_4Vh^zb_@2*%;YhE`QP6DK)Y5#ctN0-@mf5ztCf1W9*db$~dv-MgPkR
zM&=jBjI5nfT{CW0vi$t|{l^QPS1gRok60Onx>&nTzu3e0^`+;71V*-7tc+}3tcwiT
z8Giiz`Qs1kt9lk@c6R1lCX8&|QeCV}3_o8kXJKVyWqR?Rk-gisJLKl_m(r}im>8K@
zy9>JO56@=${p02J?%Ca|Hgvr@vifo=Goz>`!;k-546s;Pz;i)@QKUn@LvM#Iv#^+G
zhi6B`iF9^nXHgL+2bPY~j+O`NoD6~@!Yr(8LTnxN3p)IG7#N%!gjv}**g4r)JHj>`
zzM%fXkC}sA=!H7V)dg1;bbQ-!_=Y+YJI4ie#>*Y*GY&JevT>eJXS#Bw(`CZp7bT4B
zH~c!(4+=7dojA-a#KzI#H`9VCJp9C*3w|A?8(uMnK6u3}#Kw8zaL1epuU_~ta$FQ-
zyxhe;;T1DGTRr<t3&sT<uR7PhY-JSc6zp7k;?;%HPQjU17QE`1vuWeSwTwa!f4`X1
zad_4ZW>!wNPK&PZo7pbB>Rj8cdfKE@u-of#WEC@`s20ORcp$uBV-(rJwL`c==!7;n
z2(&w_P6V?-(q%_jN9uz*4k0#HW<e2QhWZYjj(%PS239ssb`CaHVS7i04xI_R*cV(`
zaFvx!=z$I+^9h}fJ1cY;FW=B%;$R1HW(qT2xe&p`!FeO1<4&h7<CO;yjO;I3JMMI*
zY=~gwc+q;{4r6eqNk_|#h!Y!_LP9$eI$CaWFmtjA-O%aenD~zI@=cSM?2H_p99^RI
zH#ry=JWOC>XS-<9`J~JBrU|3a%blH1x^h-*VB|Q+(IwEaVJ1iCldhADmv3xf<h<GQ
z$foN>=aY*GENq;t%-sUr@&`e>yDhriH<}#I+QrN$rp@pWDVr|fIRHu!iX8?U>{(bq
zDZ;lS=71(UD>zBiJ9Jcabe_=UU>6h-X5(OG>sa1V{UV5mL&(WNn4N=(g^`u9<I0M&
zCp5X)I5@dES(#Y>{`}s_u;MI}5ZePyUKUmkPFBvZ-@kwT{^w_>?uxT7mT)sNv9K|+
zeE<22;YVlajwLtFa<Q{=vavET|NHs1Lt~>nW7vbUoZOu3ENtwo^*?{SsOns{(}O8I
z{Ki=>4ptUcrXN4QfBoHge#bW^w$KOP*cn+^*%(=WzF5+6dgEb6&Kuue%Cj>wv4ApX
zmqN!kUJh1H4mMV{uit<E`_9lQKj9k}3nMct8_UnHzrJ=AZ4zY?;(U3SnS+z_g$^sz
zkMCc9cDk=Td~+5T8z(nATRrQ~uRp(bEZuaOiH-f?8y+SW4mNf+mR~=9{`k>(c!n+$
z2g@T7HkRK%zW)5vdAM7Ri-CcWm4)%g&#&J*3%mVJ$FlwW_4UWkf8AN#m9sm#949Y%
z!^kKm#=y<M!oVT|Eh%^KFoViRi3jQ|;F3||g&nhqFnfo@gW!5llH&~SFyLfhU}R>s
zcMJ*b@L*wQWoCIG@xWul1XfNqMt0T*63m?J!W$+qv9iAq=VW7KVRZ(@-V4hc2Uvdp
zWMh31!|LqJ$}0F`0wdc62?0<E#O&<M$?oLjAk4-obV5Q@<g2suPc|n97Em@9Vq*no
z>=(&Q^?!ff5CLUv5thpf7#Ln8-_T&>JR!n#<;p|-7s(Gan1t9~EO?=DLxhEa!9n;%
z04RTN(73VTMZg7(4I)eo3@>^wq^uBOW?<mB(8G9n;^YSl7#GaYc({2&z`>&v0uJ8p
zU}O}KVEFo<A6`PO;9(LG?U1~n!6Gc?Snu3n^uQ667KIr)q#lT|GYE><J2C{%FyVD}
z4g;4<%%DKo;m7Ul93Bq#0GrSasRw?HA`hGxLm!B-3$bx>u(NSIFnQ4OV$K5{ZVon3
zPG)0gV`qEd$1Ef&a>MC{05i*is}IZ`NP#l_12IO<7g69KxLp52ikXc==!F%d@Cl9=
zVr-YMFfd%c^1|dr+KYe}Q5SSB$}wGD@W6zbQ;7414&#CoVh^ntuiP-X5%I!lq0fVi
z3lW`3j0`WFR_I7FF^Y>bJp9iB_vZ#4Mv)Hj8*0of!eSkI4@5zcCfeb8LzIa_u*3C%
z7HgQ0lS935hdl?_V{9CpE9zc^fYQ7uGb0P@iaKUdPPQ9bEZm&TOb6;%*n~u#AK0@)
z6Z;8KM)ntVJi?C7@Wg&WR8)wQjaAr@lhe_e5uDP0fQqpfPK@j?tht!&9obkNoqvk_
zeJI4V;PMSgCJy!+lJ!hKe!i%=sL6Qcf)OLf3$GVOETG!^q$A^%2S$wSFMM8jzo=ni
za6A}!10?VBqK46ahu8scCU&+9DGS?gcr&uSSj#B1<L|{~jF)e$e=)UlD>K8D1rJUz
zvUi?2u)g#0f%Tog4y5d0WE29W0@T*S4oTK}P>ICSA@xEGTp&3*Gf$9uAjS$RjW}jV
zJ<#C<7et`8!VVKgkrQH|<jcbPLW+^|g&(8HjXY2(B*w<V%E`{g`a+6Hi2X&=i#$e=
z2RfXrj7%)-Y@il`3CK$vFY;bEaY4!<MpicV2T~xF8uid}=;x0gKS2!>CU#C1VS6?X
zPIyTKX)rLpP!VJVMGL4X`u_9RPX>mczh7{^5M^Y35y1{Ej!tSY{(8W}#K`_4kCE+#
z9rM5M3@`K^I<x%z^Zo0KAU0NZP?6N>&h+o=ivZ@YKYw(_y{xZd{_*qcfymD42W_2w
zH_{mydKehFc^E_)xENR&AO*++Hc&0LgO^Q6)X~YA<$??cxcYW<W_zH;!76NT@5s*S
z_&`RGg^i7c)!vbV&C!{eg_WI|{Q=(#wHLgsOswo|><^;YzJuEl7g9hil%G5D7{70*
zI9AWV$R*71<G(00*)lUQh#cTNAjrZ1swqT38Pm~uf*>oX#lWyZ^o1ZhC{NluGMo^-
zAjk@8sxY4reUW)XkeOYG{e<X^W;Rw%HV!uS7c9)2tjs&QUno7$Vq}{!hh_f!`STBK
zD`Q~f;zq8j>%nz3$bT2aSU@%O4RJ0ZHfLv0-ORxHf>VTp%}JOA<PKIgCkHkTHU<VZ
z_6MBIOe`D^eA(GJSU@$>g$Pz~p?n~j`RA{%uoCCje>Mha2wq@2!Sg}{WJ`zS1rbnk
zaPBbT1Qnt6V2{m^VsduAA;QW4s{c1gy%1w&aB_Gd{-ErH6e!WH=zL+qD0HJ~hS-Z$
zY~c2-NQW331Gs7XqKO4mZEiR(0B_kstIZ29g%K@Vc-8rmNdT!`%U%zvK40*#fU3`%
zG6K-1EgP)<+-S%JZQ1_&`E`Zp#Q<hdQgZB!xtY!M@At|gc832<tOAS-3=Cv8)9Z<B
zr_-vLUQc8@omS2CdLrBDv}&f;6WLBD&`g(*RFZ@@(@&@~N_5IDfHu<^B|H2&z^(KL
zrA$&So!KYh4fPv-jP+8TlTN}~>x|MJ>N^na^*M~uoeyS!TkJOl8KpYZJ3uXV_6x5%
z=0KY39i^b=dPixO($2Pv7EDUgU5j^Zg0$FQ#xn|aomzAg)Mh_v!6?!ByX!v_1H*+^
zj4d6d-D;OjUtVEU>bCE$_oJlsj-&CeBqO7Q+IW{mZoJDNHQwtPEfKBv3lWT#FE$`r
z@Do}Xt>JC>nTHwWF2Y;!ohFDj{Eil8Hdy<eQTAa1tObA3<RJ$W8@LhQ*~6%`5Ymjd
ze4xX`25rYrvZ+520dL4NGccsy%3xw=12yJ1*^u6tC!;N2PtC?W8EyG`YBuJ{Xv^1A
zvoTLbTfUwujd@V^f04`tZOfk!VU|E@%1cTjHRV|(B&Av|Iy1rA^7S_~7^Mz|KM1&>
z!6>~0+Mo|$j9ysJ$Z?~GQEG<Bi%&BG4zBO8IeDzZ=Hwk%<%**@PjYL%o|TQf=Dds&
zYIB~OMMBcjQbvXqxiv2p&A=d|1Z&Md&|y-Nz9`3N`9O+=jZ=v8f)1ll{YDc;r5h#>
zBA6s3Cwj4`%E%~5NVc4CTA21Ck5Or38JW#`VPaeL^<*{cK?NMPX1$Uuv{?^p)ytr_
z>MhY)_4Q0LmM>BmIbJ|p_7A)nt#25Cn)Zxx7p8&6EI>{B3*d(R1#c!c_RcdeZ!^k1
zIMMm|!g?l4na*Da*5hp46VbM>cK{Cr(x!1wMBBa|G#W^&#yt^j`+8b7?ulsI*Hfi&
zFCir<fu(UzMBBcemW_KN+V=HgG;G`x(YCJ#4_o7D+zWyl_k5sczEEQ$!+%Br1{M}U
z1~!KO?9GhKjEw9I|Cw1CnHYq~>;TjgJ5W!f4nRGz1NAiO0MrvZP*0-{Ks~Vo^#nQq
zMY%<}$Q^(pqz*tXtOIaEov|6U{ohevdJxk3KjGJL7}53zweT+rg2w7^3Nn^-yn?m-
z8B4nKI$nXQg^t6>ZGXm+j#AiQeP?{vRTc(TPPUU4oxi*Oz2?2}im|y%3DoHCv_K!P
zuLsQ~kuqS9qsi}3R_1`(<S$2V@|Phs`5DWRTKx494_Z(f{6~-*{6`QC{)z7xOAt-|
z8#*^l;A8eT?jTzH7g|7L_MJ}{9iYwqa-`;dM+DNaJu?GC>y3zd`Zo75TKn}BjNOyb
z+{b9`*HbWdPeyYeqqSd8!Pq?+&3%m4emyy3_n^#<(%dg%K#bhy<{~xsUx+X^BenK#
zXuPmFvEfC)35^>z7xQ2At_Y|<*bHvym+Y`P@##SYV@c<7Mur6`8xPZ>v5%##U(ZR*
z*nOD;YGa?3r6{+&3~lJXq=<pR!2#CTzahq0a#4=49NN~up~IBhywT(WsHI<&JJE}=
z^@SgEQEqd6huFis3wZ}CXx-4q(ax{OKYkA?*04479m>%f`eo=1{c^O1K4aMfZ<J>K
z5pXlVzMb(1qMgrJ0vW<*Vko(>9z23y+X-stmz8z?I>pK8KuJp<dqcmTI>Y!xwDhqz
z^y{fJj88;MAA3W;o|P)Y_(Zhyu{ZSVNgT${%`M6$uceQ@p<hp(VSFN5`q&%#_0$>0
zC!(c~y`f)^7{(U{we-mx#wU9ezn-qEZ7>`0^>kfrgV~6$2TftoZM6+%BfcJGwM{}~
zR3vgMJ^`r}ABoh8M<2zHLLS7AMsCQTKpMoqD2O?PUynM5&luGyh@~CRn1D2X-)RAA
z%6H5`Z_1O^lCQ^HdJ`QJ6OG!Gk40|E#~?T5W09Kj=q>qh<d%Fmq9u<qbYG7&c7Kxt
zOFKRq+K!LK(~fVu5kYP<z8<tJYXFzv)U&a(QllMDZZp1~o1Kjs?RavV@%0i9f~nDt
zC#M+?%I)<i?f3)+L_0n*615$VJZgVKgE0y^Xdew}$zOnu*<a`(ZN$Fbk>nwJEUkE=
z8u2mF=#BV<$k_TAv{rmnGy_9)G*T-*>Y^NDETR=3*#d3FCqz#4Vr+Zi$D9z^@&ddJ
zXG6rp8d96__0V-VL=V{GXvgDk#)FD9Y|Z%S*m|^fd<=R!J{G+lAA{D84+pp7+Zn?V
z&3KgI`UBHCK~4CW7_94XK<h6S@a~XgC1R`|dkdbj27EniAr9Fsc*+{^^{|CFWVhfc
zYrxmT7UGcIf+w*79~l)HiPV6vhpzj948eg`$k2BkPCaZP4%sbu${O(X&;{n~WVhfE
z4R{ey10Fn7FA5&27iM5&6oC!ZGr@=IMUjW<>uIp2o|K{bdK#>$$86=}Zsga~U`;({
zD<4lIp9X8{F<bd4jr^#nsAza2zrI7g<M0jeQk@&>jM3mWz8|v?8+%9TOz=7#P9Zi9
zR+hlPzyNp~|A8N4P>1>o_(GiruR!g3CKguEc>PNYP>cSdAQKz=gICPa!9lPAd&t`Q
z2c?~DomY0eVv36HT)S$+#d`4i`c6UUkUeC1{exFbK|!5upcVE^fx(??yM34#7-+Cg
zCnh$oJ`Sm=-=V|8CIney-w|;^hY`BK{zeOIdHu~=wvf=UP*x838hah4(9jp~W%dzF
zp<yrKYjiqV9<)3Nhpe+dv4J%Pw8sRx%DxBI(yw2+1G3B>w4{FLj?O2Y2@g5o%j|nz
z_PoTh(Ej8T=J3$a!z3@Z$Fe@Bo}P>Cu{8AS>ABb*OGCe&o{R0VH1zA~ve+J!<q-}2
z1K?#g;Fb0_>O~l%Z$S9a#r7989=d{;=OA)EsHy)zgE43YSYhvriV5Ha_b+-D*qr#p
z$`TzN90VG+KhQIAe}@QZYjo;qx#T`B4!y-69TgLc+~8-gX90x`1H%m|$cp<HVvNxb
z#2zYehJ=QOv4U3Vyog{43JeU`Xu=B4`Y&`Qh#fFt3JU5FyP3-r7`(uV)FwYli@!b`
zw5pf}EAL}s<KnP1`A<NW-9y*s9FVL>T5^BG8)d;gtf+&o%()>6D(b*Xb6!X?hP}7}
znuXo*cZK%@!_KV_QW#@ieC<4Q;6&%+11CCv9XLVcP<=h!SKOmE^y}H_z2Y9Vp<hq;
z75AtO{d#7at+)>i4h%qQ>0@u`*9(c#dBr_yL%*KxEACMn`aWc>xEBMp^r35TnBfh3
UvGzF;Ozm?bn77Y~V43I+0B>h=rvLx|

delta 36
scmZqKCcO555GxDA|6?qTtgWn!TUnWAM6{PoW@;~)%)Gs1GRp*a0Pv#?761SM

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"