From 1204eeacfeaf0177d1513d71c8eb318778c8d8c3 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 24 Oct 2006 12:56:14 +0000 Subject: [PATCH] (svn r6922) -Feature: Add proper cloning sprites and cursors, different for each vehicle. Big thanks to MB for the initial design and skidd13 for the iconified version(s). -Codechange: Change the autorenew sprites from recycle to upgrade (skidd13) -Codechange: Change the shared orders icon (MeusH) -Add missing table/files.h file to VS project file. --- data/openttd.grf | Bin 28153 -> 30378 bytes depot_gui.c | 7 ++++++- gfxinit.c | 4 ++-- openttd.vcproj | 3 +++ openttd_vs80.vcproj | 4 ++++ order_gui.c | 13 ++----------- table/files.h | 2 +- table/sprites.h | 15 ++++++++++----- 8 files changed, 28 insertions(+), 20 deletions(-) diff --git a/data/openttd.grf b/data/openttd.grf index 5674a4b387511c95e1c2175c62dae3ae57fffcb0..f6cebe73ca60a1409e788536bc96eae9cb5b8aa5 100644 GIT binary patch delta 4107 zcmai%e{dY-dB^wN-P=3u?)|WJa!s+zu5>4z4u&{D(jp(Wu`v}6b|K7!bz(rjq1!-G z#*=t5I0r>8dqse#nDks@az6ma957KQ^ zb2mwIm<$dMGJ#3~f_OZ^-Xu%zav*@Q5Mr0azfv*m+;-i8uGViqw2M2$J;*)AeU*Ej zJI(zw_Z{xvIT7`uL+B{VqqFD&`Xy5NUj9ygn17N#&3}i-{D1J9gd2rV36BWRbJ1vY z>f4{aF>5@>h0C#k8rF=7VwA<~?escvnhUGNBS@v=d?ez&AgHR!1SW~zG^f%euWP05 za)Qp20PpE6i4^jJ(_Ngk-{7Y?y3Ag)y7Nh1;@kxPa?t4!AfL;e0A*mpvcv~C@(bZq z$e@1*{~%ddj#;OqnWmQVXj0O(Qz1>Kf6Q)IFjn9-4U8@4cK%d|Y?C$1v{IV?((TA7 zZAWr*tAahtvOL{?X&*96eMoKoWeDq*VGWI#>=oWLm_bg_qkK3*pFtMe79}G?8U_l6 zvrv`MF-%_+BT=lghhqkYTKVNXkB0^^zQ^t3qY?Iluw_Bvh6YB5{TB`&bnoXQVfIv* z5Wn1hz2SxPhn%A*Og@nC$N&_ceJ%*49~>MSc3-65YTSl~S)b^apNjn8pmYBaQdf`g z_$+&v#!0~19>nu=mSvbttr=-T+7 z{|)KQBTQPmbL}oyDyhh0+gYbz7>2*1sPeiub^6FPbEl7Z!E9;w z=*tqM01{9t1g}7h?kROk8vtK}hKfD%Reqhf*j>TP_-=83DPo`BF4|Ly{}#W9RFcge zddii~WN7r{ZMnyC#~TxQG$oGixa)ERlWFo0!ugIiyx?G5gU2bb>qHJaRl1q4EjjJ{ z(iyw6jd$tg6ahA;a#Gl$0+N`FKc9nFg^;{bakO85Xg~ zneN6;)n7Lm&pn!ZV&&PXnbGd4)TsLB`9VJhyFO%ZkQ_i`S6g)n9taJ)kBgNWmRW$W)$ELbIgO1nvv7%z05dnSOmQYBp1jXaO?_nk zenDc*$8gxjz|9`8$xJfRzo(qbwyeq1WaZg6s<4AXwNj%o9;fIt^gK$rW%gC~ zC+zF)+vRuJ2k#2#kMyZu$=7BbHLoGv(upocWLfqHGz>s%FTEEIPL(tYZ zokHQV&Z}VyKBk@453RjcXK@&*#Ra4`VlYjYuU(&}g6gT%Uta1gYmH2EkLc;DLa5U@ z6My~M#vVqCoqnpa{(+9Z%#}J7Y;7b=hrQYHipCon$?!5RX^wubEJAWDCNjOOA#YL_ zbs1|ucorK$Fb;UboZKtPD%L$2PBskNo@qd+^a1u}1dP!FsB9~%H9X4;;Rt5mqd(=d zI_zH1`AC$Fi}=Z>$C+Nz(2~6u#$uyWczXOqvp2BdHzAzhR0@07ZUxISexjqP!1t45pm^{y+88*ZLIvPEL-CjqqEnXx?50Xef99#5m$0lq`&bz(<%#<`tpy#m0TrH zYWXEhB%+Wgk|#HbzVova!SxC{9!@BI6{xd;41<%d^bXRymkI7#bYt$r(+6L_$61RzZL5Z=5FA)pKt`Wuvz<*vs4BoGL< zF!Y>c;|7FhK3@4`<3X17ir~`RWHHSW%UerHsDnojfGU>$jO8jjkx@>7xdvGAo-cj5 ze01hjUen#@P?((oJJN&puyk$#apkUnsTgLeoX)Kwc_kIaswSHn4p(3dryP^KGaEtb z%B2WaAoUhjt8%5PJMLYx*_%*!tsh`WrBXBzRBHaTu2>0?i$rDG8N#NCp%~LpE~v&l zEzN$#H*NbxY^F@w>8ox6>LV8VQJD6#J837Hb`!$f9A>@t76wXXRLEOYz5;}>bC8#8rfYp@M-~7+U zK9UB@mPEu#Fw*>0bBz5VO$*=+NY}}UAhtAL_e%bE5{(b6{?)$C3st}Q&Vb_9s(EK| z0qftDF1~+Z)V-k`LRr~PFm>%WYajZS4td`_#6EV};@Q5%yGpyTp|d3w#>He5)HA=y zw;5K9#frCtu%;>+3oESrWZ8|6Dx?0Fhdyp|JjH-Z0#3zBa~_AS<( zn`8xFb|f^f!u{#WbReDdiPmhOeWmjPm=gON>=qt8$*sjz`cwLD9cWIrwA5Df3E((c zO8ySV2g-+mWB*=ZC4scCodAwsDo+E)NuT3{l`MB#m#hO;cdm_n0o3$u0C|TG^3HXT zNekr5HG<E*u_6;<(^bnZvMFf?I!8=t)$o?3jHRgmXC&Gz>+>OW6hbeSTqS`7^T<7hjdJqM3$*>&_y5 zM_6>~D^J)5){eJh#nUwta$Rv0Fq?oyzVWL45(+mbn|~VAaUKY%yw?}-fR`oOU3eRg z^qSB$^*q3{s3@Md2=g%9_=nd8A%gYhM+#nAs{5CzEHqm4)9hwpX$cpSE8hgq2^U;; zqo`D>-s;UDUz_sD3wH~EcJpfixmxp-i$?wnZ+#BowPzI5!(lU3TS}SXTnbvoWG6{F zuv9m7&+P{J{qW+?FT4SrP|stmn^w{Ry_kK|KEOWnUhKVgSF+XpfbOI0E0@tN_~;(y nP+J>^0NZtA-~&uW#JOP>W1GnqqFS5to1HymFS)y=h}{1I*X9sQ delta 1973 zcmbW1ZD?E98OP5#_v%{Ky>cAuDobsxyK)j&Hf7MYFxR_Fox15Lv}tI%aoYtV*{+?4 zb!?$@DXi1d#Ni${PBa8XW-n3Z(P@Q>EIv`a#{8?$wJyU$%2d$2b9hc$}=GA1X#+ z;2qgXsXun-!nrRTc>d4-|9kE`AK_0w#HH6?$PD7%{(jV5Pg>|9^f-DR&7&V7ik8tk z=zY{ce?zy>N9a=&z*mvy)oZn;UvK#d%XK?fQQC4@t?o5_kB1Dy$s*2S0Q(Rzxa)Av z(->J-2t+Z1Xo#m>ZgJ-dvEV*=ioTLz>Pw0RrWny3?z)_ynzyLI2(c`9GUU1{ z8b9KDv_~9*bNjd(L`NQOwET|Mxzua9Tz7dds=O6AZ^S98h+z`9DhH}@aYGGAsI;U_zuh%Ykb-(V{YF_aVq=1C4 zSe63^6yIBbgPK?Kr47}CYTVKgk1OtSk2u)xc^PlPuX*)*p78&W0OC{8e9*BR$J!kj z4DXLy`Jff=CbK)a_Fzvu6q0^&7?SzL6q%nG<&WUdCW1dfOa>V1xf>uqrW#?tzIhH? z;zUMajKjl9n!Eh88t(Ib5yKY5#CTvkP5uVy+p7E*#y6M55Z1*n$W~wJ6EP0&$`Wx| zAY8Zuzr{K{(>{&E*$o^5uYH>s^6}3xco+9&HwuHdB*UJ&(1lr@%uVK^i-e?luWo=T-a z5gO+HCfpIH+S+v__AF!iHF|^|r>E%m>Fc*H=P@?TZQ>NUL(ZBT%6&W+oGeVkqxd)Z zsKRQ#I8_;g0|YT1AG(3%EXS23TsLox2I0fy1bu;?&fzorb2sPqWwH^NfU&IXv%#bJ zW5m#RY!D`Ft7sbSvn6T3x+iRLy;|sH`G#+V{6@Z1(%JfY%hNkvYkj>Kg|Cx(LumPb zsd}TS=La;z!mPCpfuEWDA9S34i++c`L|<9H@c9JFFV8=tWc>Y#ZQJf%7*MCCY*hS` zY9Bp1CH4_}vJmBmh&@#_VOS){Q2#QnTL*sQS0)D$R{h$6`m zZ{o?~gvMr5$=PY~pfWwf{0ZY8I<{n~ZK|vbPZ;_oJPC6*J+H!HNu(t8y;0D`p5g#~ zf}Wt$^oO|{-`oF1#j4DcE$^)TtauGO{)-TMZ?t-UF+z{h z=jjYROV8)_+U6Hlt?yFpUz6DGSX_#bm6aWbAtGH|EyE%yvkF((+6tI>8_1q*AXiuO z_kbMz9Favkh}aI365i{CNw2de{Vq+@*FJFnFSW)lwS~J%ZNk=fl=h$ + + diff --git a/openttd_vs80.vcproj b/openttd_vs80.vcproj index ebb717b9f0..b0bad38d4e 100644 --- a/openttd_vs80.vcproj +++ b/openttd_vs80.vcproj @@ -1443,6 +1443,10 @@ RelativePath=".\table\engines.h" > + + diff --git a/order_gui.c b/order_gui.c index bf53ff958d..d80f70280f 100644 --- a/order_gui.c +++ b/order_gui.c @@ -63,15 +63,6 @@ static void DrawOrdersWindow(Window *w) v = GetVehicle(w->window_number); not_localplayer = v->owner != _local_player; - if (v->type != VEH_Train) { - switch (v->type) { - case VEH_Road: w->widget[11].data = STR_LORRY; break; - case VEH_Ship: w->widget[11].data = STR_SHIP; break; - case VEH_Aircraft: w->widget[11].data = STR_PLANE; break; - default: NOT_REACHED(); break; - } - } - shared_orders = IsOrderListShared(v); SetVScrollCount(w, v->num_orders + 1); @@ -572,7 +563,7 @@ static const Widget _orders_train_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, -{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 373, 386, 76, 87, STR_TRAIN, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, +{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_REFIT, STR_REFIT_TIP}, { WWT_PANEL, RESIZE_RTB, 14, 387, 386, 76, 87, 0x0, STR_NULL}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 387, 398, 76, 87, 0x0, STR_RESIZE_BUTTON}, @@ -599,7 +590,7 @@ static const Widget _orders_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, -{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 384, 397, 76, 87, STR_EMPTY, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, +{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_REFIT, STR_REFIT_TIP}, { WWT_PANEL, RESIZE_RTB, 14, 397, 396, 76, 87, 0x0, STR_NULL}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 398, 409, 76, 87, 0x0, STR_RESIZE_BUTTON}, diff --git a/table/files.h b/table/files.h index 2ec2cfe08b..7bcbf64bfd 100644 --- a/table/files.h +++ b/table/files.h @@ -60,6 +60,6 @@ static MD5File files_openttd[] = { { "autorail.grf", { 0xed, 0x44, 0x7f, 0xbb, 0x19, 0x44, 0x48, 0x4c, 0x07, 0x8a, 0xb1, 0xc1, 0x5c, 0x12, 0x3a, 0x60 } }, { "canalsw.grf", { 0x13, 0x9c, 0x98, 0xcf, 0xb8, 0x7c, 0xd7, 0x1f, 0xca, 0x34, 0xa5, 0x6b, 0x65, 0x31, 0xec, 0x0f } }, { "elrailsw.grf", { 0x4f, 0xf9, 0xac, 0x79, 0x50, 0x28, 0x9b, 0xe2, 0x15, 0x30, 0xa8, 0x1e, 0xd5, 0xfd, 0xe1, 0xda } }, - { "openttd.grf", { 0x3c, 0x9f, 0x90, 0xb1, 0xf2, 0x45, 0xc3, 0xb4, 0xb5, 0xbb, 0xed, 0x30, 0xec, 0x07, 0x95, 0x9e } }, + { "openttd.grf", { 0xd9, 0x68, 0xb3, 0x59, 0xd9, 0xfe, 0x39, 0xdc, 0x23, 0xe9, 0xe9, 0x3e, 0xf1, 0x65, 0x55, 0x09 } }, { "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } }, }; diff --git a/table/sprites.h b/table/sprites.h index 3af1804429..9406de8263 100644 --- a/table/sprites.h +++ b/table/sprites.h @@ -48,7 +48,7 @@ enum Sprites { SPR_ASCII_SPACE_BIG = 450, /* Extra graphic spritenumbers */ - OPENTTD_SPRITES_COUNT = 109, // number of gfx-sprites in openttd.grf + OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf SPR_CANALS_BASE = 5382, SPR_SLOPES_BASE = SPR_CANALS_BASE + 70, SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78, @@ -71,10 +71,10 @@ enum Sprites { SPR_ARROW_RIGHT = SPR_OPENTTD_BASE + 91, /* Clone vehicles stuff */ - SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 92, - SPR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 92, - SPR_CLONE_SHIP = SPR_OPENTTD_BASE + 92, SPR_CLONE_TRAIN = SPR_OPENTTD_BASE + 92, + SPR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 109, + SPR_CLONE_SHIP = SPR_OPENTTD_BASE + 111, + SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 113, SPR_SELL_TRAIN = SPR_OPENTTD_BASE + 96, SPR_SELL_ROADVEH = SPR_OPENTTD_BASE + 97, @@ -90,6 +90,8 @@ enum Sprites { SPR_REPLACE_AIRCRAFT = SPR_OPENTTD_BASE + 107, SPR_SELL_CHAIN_TRAIN = SPR_OPENTTD_BASE + 108, + SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 115, + /* Network GUI sprites */ SPR_SQUARE = SPR_OPENTTD_BASE + 20, // colored square (used for newgrf compatibility) SPR_LOCK = SPR_OPENTTD_BASE + 19, // lock icon (for password protected servers) @@ -1186,7 +1188,10 @@ typedef enum CursorSprites { SPR_CURSOR_TRUCK_STATION = 2726, SPR_CURSOR_ROAD_TUNNEL = 2433, - SPR_CURSOR_CLONE = SPR_OPENTTD_BASE + 93, + SPR_CURSOR_CLONE_TRAIN = SPR_OPENTTD_BASE + 93, + SPR_CURSOR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 110, + SPR_CURSOR_CLONE_SHIP = SPR_OPENTTD_BASE + 112, + SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 114, } CursorSprite; /// Animation macro in table/animcursors.h (_animcursors[])