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
zcmbRAM85HrJPQlM|EG;Ctt^bKEKIE|%&jaett_mqENoj@*f~DcvoieWVq{_E@?+rS
zWMN=p`2Sx*h(UrujzNV%i@|`wjKPM%iJ^rd!^Xzu1{-6>10E(X?+a`XB$&LtI)q*b
zu{1Ge*ifLi9;*4ze+C9z7H3>w!(%NuIw79E%UQ=z&&kcjz{K$PznK_=6oWj2I)f2|
zJ%bNJ1Vai#4nr|R6NkG;Gn==ECo_w?n|C9p2OFceyN9QnS0kqvGlPfM3kha7ch46R
ztjrAV9^NlhncO{IsIo9IdU&1S;qYQ+bocOLV!a^2$>ibQ#Om(O#PmX)mDRnG*`t?%
zlZT6esh;8Ae{Tr}X$B<*Ee2BtM+QHJXohr#VuoslCWb~1cSbfJkP{eL+`+D3WO9c&
zgq^_y#U-B1EFhOiLS3Q;a)}y2m(({hd(<(20^!^L|Njkf1OkJHdo!b_hc_dGM>Dgx
zn>!<eR~xgJo2Q5S17R*^W>0swW_C|6j~l$~9`5eV?A{&^RB!MyHL>52WMq0F$==N7
i<>Ai6{6d74&E12M<pn#dhkGL%*xo8G2Krmf00sd1H@Qdv

delta 43
vcmZpCB|qtjJPQlM|J#i$tt^bKEKIE|%&jaett_mqENoj@*f~D2F@OO8DbNa%

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
zcmd;LW#nLBU|?`ykYvzd)L{g%Ny3bd45Vv9*zo`Vq5m*^`2S&sL;sI39E8$mp)`zt
z`v0;23<v)+90!w^!Q}D(3`hPmoc@30{~?A${|_@9hSKMuG>CuXKf{^-hhh4T|7SQ0
zV;=>v4<lI#vg#ZX{}4z4%za1xpI~tJI0hmaj{Wy=KLI5V|3C8o7=yQmC&RJ-#~6IT
zY8X5{ypJ&)`wyW(DvmI?yLlgC@HqDW2!lIRwZ|a_Z#VZNAakHBkV*z`cMnfDuR{!8
z$NnE;aEI#yiMV-sxO+1k`;TCQba;4qGPt>Wf=%~8((Q4G!PDK1!PCp**nb2Yq{H3A
zo8geV2Sf+5?n4Y7hd|DA2kU^cK{^;bydXNfj{Qg0?FG@{<pFUONQajP16YT<hZh6X
z4rJXRTiqGFJlrAv_JFWKIu0>-xHBAbKMV>uB+Z8z4!MI3ItEG+5GF*qy9Wa}_>eS$
zLf6Cn5CbHfK`fBc!wepv=s3gx({YT!17r=DI{g32f3Skb@U#eva~=kU|L+*yy=Qp;
zf#JhPhL4{ZK7D5R{DtAmSB9_O7{0Aov0}%L9VbqlxN+mgix)5c{P|;I<Kf~H6OmAm
zQ_|AXGh@zzH5+yuIdkETfewp<4NriNNJ5NEMTNtZDJdH^w46D!A|)lIq@*MxK&K|d
zV@6BNjs+E0_DuP5XG2R%O9YERfq+7Xg2@64pFJTtXEJK;v`lz2XUU&E2mV}O`18W%
z&z}Y#4Tc08j*<wOjuMMG9RVBW<Q&=3;UdA1pu^JO!Z9a7U`K_-l{pG8b_o2r!tm!u
z!=FC~6j&G>L^wiZ1afp_8Z0!Xcv!56@!63Raik&V%9I8U69xeX2893?g9H|b0-lf-
zk&G!a4J&jU92|696l@|40y1neYJ3`|#LU=`v*k>UfQf{HhmJ*phfhgFLPt);l8zY%
zR_wTQLP3JTLWUtAARxkoC&NLaCPb$v$6-N3gpY<mf{8?li$+I?#gYVv9R&er8WOHd
zDR{7=;mw{Y0WvHp8X^@I8a+M^3sMqxbabd_xEPp(I5?yP1eBztbhNZAS+nNAl`9Vn
z3=AA}CPX-_$?!Q+5%HiW<IjSQKYLdEVUWmSP-$T>S-{}2gCXIHM8zG82`?g6d}uiG
zXU~H_0uBih0XZ586($8O0X+*!)*P5~=FXW9f7Y0oTrn~EV`B0rCF0M7nm;=h{JC-B
z&zCnIA_XxzJq0c+dQy(8=y-5q!;cF){=c~J$A*C+hJm4hfnfmy!x09C2Mi2<7#RKp
zF#O43_|w7gX9>ff0}OxeF#P$$aHfOf$pn@^a~S??F!*yM<<E^791;;cDj6asH8L(e
z8Zk>OD)xBHxRJ8vLChSJoDB{&CwwM6h<Whk&xtobw%mEsvgby`j5PuR0tyNW3N8gI
z9wiz+6*>Vm1|ba|DHBp!R^0gVC!t}9OG1y21V@gJ!~_qM4LKo~Ce{71VfYim@F#=e
zPYuJLDGYzsF#I{f;K0D}pMk-^fWg6mAs~R^|9^%lQ>J`p`2K_8$4`czzZib~X88Sw
T;m==&zyBEi{b%_9|Nnmgeulo%

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
zcmd;LW#nLBU|_If5M$6`)L{g%Ny3cQ45Vv9*zo&51RnZ-nBma>BMgWB9|F^7(fG&y
zAN|j8@IS*5FuDw5AOFvA?Ehh~9*F*f{|_^qN8%s;&v5+zArJx5eF&`kEE4z7e})tP
zK^B8F!VEh1{|Ez&e;A|y<i^AQGY;FFff9#oGS2+ZIAoJ?<o{tX4dEe^U>O@P?=$~1
z&`3fu-d-R*s3ajhxa~nT2VyeFG=>ZthBN=s$s^GC;9+3+FCZYGprBx2VBp~35D*ZM
zl9EzVQqt1WGG)q?6)RTk*s<fpi4!+&+<5Wg#h*WaOl&+{d}1OJ3UW$XT6$*8S+Hiq
zjw5F-+%eE$aj@YD@DWLfk*TO~m@*}0!-keKXI6OVuteC1WCZBcWO&SIiP^EB;>w;W
zU+!#hU|@-05hxH)=uj|OVBxbTB<D;<&7GDBZ{{rdv**B{3k-i=*!=m^;G@BiV8c-o
zA=6P}F{dM7!<?KWTRL1M7!q_?8eBN$Bna%Nkhn5O;l&PtKUWz3{Al>|=YRqWgM$c1
zh>Spvj!c7v#uN{W6)`?Law3j2<XoB3z+u85;J}~|z+#ZV;!wa7(jt;EMW$hej*N+f
zj*Eg#gh4=tO-7AR!<3jA8*;XssSz-dQ1H;PNbv9}iAd<ksaVo6<G_j?cTOlsFj&Yi
zcxbRhnDAscNYsSr^yD}!Xo&F95J)hQC~?u~2(eg_;IN}0;7mipl_>=eRy4fXGbKQV
zB}GG|!a}3R$6-NA!j6s(6%7{ylMn}olz@Pel$4H^mL+S}9Jq4jfrdzdgU*Bqhcy{K
zM=By7^kn>5(D7%_ia!hzISeW-3?>U0Ja#Z7T#=}_V=>`H#EK6MNB-=2@JGNQK_VbW
zBcZ~ipe3MZLCKl}bI#m3^Wo1L6O$_@CVxy!{-i|wnNag*$AUjMPW<`u#zUkaMyIF1
zWkpZQkrf>ePHgybVaNX$7yj5VFvKu0G%zqMU|=}H!0>>9;SU4Dp8$qGIShX~82&6_
z_;Y~a&mD$8e;Cema6Fm7@@EdipA80oj->p#F@r-Qf=4Ao#H2>XrAH%XiABX8j~O>o
z);x%rW0JGMq2`3oga<JXzWh1y=Es&hZ(8=;h?ueF3&WSM3}3%7eEZJu{RhL3pA0{L
zG5q??@cR$LpT7)$|1tdg&+y+zf+I&qVuFXshMbT~lj{E1F#HK&_>;l#r-tFr6ox-*
z82%h#aA08g&%j_{z~JD(5D>ud|38C*OM!|<iH1*wPC$)8NP|bpgp`&QH@^HyXjtNs
J(DVQQe*nj0RGI()

literal 0
HcmV?d00001