From 82d4ffacff3398b44b2b16466f1305d607f0f57f Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 16 Oct 2010 20:00:20 +0000
Subject: [PATCH] (svn r20950) -Fix: (or at least greatly improve) alignment of
 some original graphics pillar sprites

---
 bin/data/openttd.grf                          | Bin 520722 -> 521473 bytes
 bin/data/orig_dos.obg                         |   2 +-
 bin/data/orig_dos_de.obg                      |   2 +-
 bin/data/orig_win.obg                         |   2 +-
 media/extra_grf/fix_graphics.nfo              |  13 +++++++++++++
 .../fix_graphics_pillar_cantilever.pcx        | Bin 0 -> 1569 bytes
 .../extra_grf/fix_graphics_pillar_tubular.pcx | Bin 0 -> 1305 bytes
 7 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 media/extra_grf/fix_graphics_pillar_cantilever.pcx
 create mode 100644 media/extra_grf/fix_graphics_pillar_tubular.pcx

diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
index 50a2670aabf0e5c55b6eee107822c7e4f702d956..292f3932ba402464054aabdd4a1dbb29c8cc8e0c 100644
GIT binary patch
delta 799
zcmc(bziSjx6ot?GIXmm7Sw&_QTo5+_D-}#NAhDQx=e>|xuoc|G&Q2l2%s9a&P5u}E
z2g{V(2wNyTEK^vi&zUtA7K@;Tx4O;Y`_4K0IIlm?wMP6@>rRVK%TB9K_rK}1eW#Pr
zMP(4jLYwgs(o{nt#%ziVw{Qn{aS!{*@fdHg%=3I@#d1B7&Y#<LCcS$*4O88SW&RJ@
z>N5N_0^7jLp0^$QH_4x+KcvT~(ktV>^|!cx9XBw?9v<Kk4)Fxf@B%N<jEGz7xm218
zU#Dz^CoT(Dr%r)g$W%dP$czH94+}{g7Fr5+?<XUt1hJFmJWC~0V~C^-d&W?$_!Q}+
zCs+6$eTJL3-Ov3H2ROo0JnzA;(V!lYu!n<!(6q4-l75LK;NMJo!@*>BX|g+*?EcZD
z>Q#<0jPNDKcz??XU}{ClUVvNW3leZA$`vKk`s!Gzl8QDd9j|s0CTbJU>&0qEHpyxx
cWSAwbbxcx)YsL;$LSmR|yWzh2A7E_m2l_X;NB{r;

delta 43
ucmZpCB|qtjJPQlM|J#i$tt^bKEKIE|%&jayHft*j+g28Kj!$e1U;qFq&<c_O

diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg
index 496e244afd..1ac10bcc7e 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  = 36d94ea7a6f715eb9ead5f9732c6edea
+OPENTTD.GRF  = 8d3b6996d2eec424eed3ada03faabec3
 
 [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 2f739af1fd..9af3aa36db 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  = 36d94ea7a6f715eb9ead5f9732c6edea
+OPENTTD.GRF  = 8d3b6996d2eec424eed3ada03faabec3
 
 [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 d06519e7d5..9c49ecf02a 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  = 36d94ea7a6f715eb9ead5f9732c6edea
+OPENTTD.GRF  = 8d3b6996d2eec424eed3ada03faabec3
 
 [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 217c086cd3..224828243a 100644
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -133,3 +133,16 @@
    -1 * 6	 12 01 00 01 AC E2
    -1 sprites/fix_graphics.pcx 776 250 01 10 9 0 0
 
+// Grahpics for the tubular bridge pillars had incorrect offsets
+   -1 * 5	 0A 01 04 05 0A
+   -1 sprites/fix_graphics_pillar_tubular.pcx  3 11 09 9 4  2 -1
+   -1 sprites/fix_graphics_pillar_tubular.pcx 19 11 09 9 4  2 -1
+   -1 sprites/fix_graphics_pillar_tubular.pcx 35 11 09 9 4 -4  0
+   -1 sprites/fix_graphics_pillar_tubular.pcx 51 11 09 9 4 -4  0
+
+// Grahpics for the cantilever bridge pillars had incorrect offsets
+   -1 * 5	 0A 01 04 DD 09
+   -1 sprites/fix_graphics_pillar_cantilever.pcx  4 10 09 11 10   2 -3
+   -1 sprites/fix_graphics_pillar_cantilever.pcx 20 10 09 12 10   2 -2
+   -1 sprites/fix_graphics_pillar_cantilever.pcx 36 10 09 11 10 -10 -1
+   -1 sprites/fix_graphics_pillar_cantilever.pcx 52 10 09 11 10 -10 -1
diff --git a/media/extra_grf/fix_graphics_pillar_cantilever.pcx b/media/extra_grf/fix_graphics_pillar_cantilever.pcx
new file mode 100644
index 0000000000000000000000000000000000000000..0e466215c86580bcb31c04edfdc1bdef79f8a08d
GIT binary patch
literal 1569
zcmb7^FRbE79LIkz;SzFrq5{!N5Qrxb6^IH1qL&alKt%<j0#Q+cs6ZeP<Wf;lfgqO(
z1OkDmKp<9BAUNo9B+K5t+#wJMk~@KT*?qgq?!Mjq?as~c=RI<6CuQb4GvCkre*I0u
zk3U?+fi(qw0_jS+;`+PV)z9$#&{G6Tr}X@r(HTr>1iziem;al;pmWML;rB!T_gP02
zUeJh689Rg7Y5enI&J0UBJ9CVFdDhRlo?V3Gq5rs;Pr2coUqlz6k~!~TPKmlW_3QvT
zhcYR$`5d%^2a2RTXY=F89TBL7@)Q`))X7bzP%fwuKj);l6Ur(n7D`hn&DmS1j~rhq
z6p319{wK`|QYu10EgnuM7c@Jys1~4DVo{$oCsa~~smj*)&Lz!OraV3MK%Dd;D^fZV
zEUQbJWx`!0a?I+a4}{8)Qw+GEc~lM@s`#imahOci886%g%svZN1%}P}7jcwFyGr0t
zz6+37m#Ex(R@^#cFUpo!IZwnK2oG}@W^{El{PTF%=R3a!ps(Q7Yj}MR_iy0MTX_2p
z-tA%k9^QX|4?z%wVYpZ<*6a0dw?jlZNAg<LFza^1b=%!ue>e)G<?SXT#gyE&t|iQB
zve{I8-x`hF<ub4=tI=rGbg5M%UAG$co2#+E-;7+>HDW?tNO>u_pVh_{ds%C3+|FHZ
zfa3|?0`78%j+O>97jGCzuaWI}`lx3|&%C?{rWAAX@t!G!O>xyr?Lq-pfDaDhBozZC
z5w9c#TS_|Fv`?}@RSRt+a_p7w#AOf^Na?YR8B^-l6*p1ylTIKhiX!DxIU}Rja<!J`
z_|@*nezt50vX~-L)+AcPFg?3D@Vb*A+$>TeWRsxlx*=cJ6tPv2+P2bn3@t5~ve?L{
zy-IdqDq&q;I_Ao+Zv*FU?CZ&xl}<FX>9(fyEi?4In{+-SR}{t4^@e46t~(eGC#%&q
zlgTJj$54hfEovIub`AR;jspbIh8q{;K9CU1mDt>5J3Aw|cOo2bQBX`#x6@`*uDg1>
z-xyAM%gyp0hqAnqWn_<KV5fy)AJ+@q-;qSUDz)qRplwBgw_S`LZbQ1e#T-Btzyat3
zL;za=WRDJL1A2f1zzN_65Mk-X|Lw%E2RO=LWZ}9S7me$iT0(9m^X+tXkZq1hcWn)~
z)t+pRl-5G)Y^&QnF76(lZSLIh+UO1iK}fNduiubHT5C#rD^qcZ)v?@Qy+_j-<juAw
z#%)RL5P4)*{`&P7mLgUFYk)04A8-g5v444>0GSLZ3cDJh6nx+R2p=Ed;S+rN44=Qi
Q7X<tYU%$aO%JwP!4}ONe(f|Me

literal 0
HcmV?d00001

diff --git a/media/extra_grf/fix_graphics_pillar_tubular.pcx b/media/extra_grf/fix_graphics_pillar_tubular.pcx
new file mode 100644
index 0000000000000000000000000000000000000000..55a4a43a9390d607368c34b8f2113b33712447fd
GIT binary patch
literal 1305
zcmb7CA&lEd6#Xl?QgjM1h)xCp1`7-f3=FJ0g8>0nYhVyyU|?WiU|<knV4VyM3<9E)
zK|nx2fI&dO0)v1waa#lTZgm$B5D-uh5Kxe|Y4^8tPPWx;dpcE}`F``?{CV$>H2&$)
zRRikr3;Yb?m3Vc|e`s9&3O_FTx5FL1pG&%eB`xZ2d0Ah6!=KY<6rNHjF7fx5`~`*Q
zbam0(>z~%TKOgWFg%@;rhO@d(YJ-;#XuVU`^`fq>;ET~84|r`*UhcS}?n<pb!%}tY
zw8o<DeqQg{L%dYf$4~0LZ}5ASCy&pXukm}D|L^m)&%N{64O|tf|6uX?J(>WNWm%r*
zB}pQL7>40EPOsOC<2X&zEX(pdFUxYX+3fdwM3hynqg$r!d-ak2a5SFI@}j!kN+Ltl
zrlGfNs~rR+O`X{+uBuEE8B=Y!h8ViqFt+k>u%4&K?Ti3pGOW+?2``ToectsdH{8a9
z!)Su@1>OSgRm4aaz*ZYQvz_#mQDV$SUU8FjIIu+~>NG|+n+M!_#P4$!*MO%8altb{
zT8(a-^~83h2&txImY#cN5qax0YRJG6;0;Ey8R9p)am!8HQ6{!!PVDfiDH*QnhI*7*
z!<lzeg{;i+nyA>C-ZSmQ3ns~Mk>%Tx=Rj$LCNQSlbO{%B#lA<zk*N!;Epxq&kaU%a
zO>*C;B72?syDU1)Q=`o|LMu>&zD~xDohQk)(2?XWA&z1694Cq6$#l9{uXjSrC*r^)
zQ&%qnbJurqoZvh|;5@jFK^}vagT3a0tuok~+3Tpl`3_lPbA~6_f$Yadf83icM%A`@
zjZ;}(%QDvCm^cVAALFLP<3Vfrme}_@S>GwLWLM5kw>jP4q6%OEL;z!e0$>M#br^si
zU;;P+TmWtX5vru|YQW$Ka3*2l;AYt1%;vS*lEZeVFIW>Lm}|q0Gu>Gu*_)BD)CW6j
zcf|5=y4fD$`NkYhk8pegZ{EV&cku26r}yyw1AMrHI|Td)A3wn-3RLGBp2!U}dFFNh
z`u(^1ir58o0YktPa0*xessCmGNdiK^Fo06vJN~uS6ZAkdLa7^R&cKPY%@OTr(y{xL
G(tiNQV^o>|

literal 0
HcmV?d00001