From c0747d26f0a10ad36a24bfc085ea985a53b79cfb Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 27 Oct 2007 11:23:13 +0000 Subject: [PATCH] (svn r11350) -Change: add missing elrail sprites for some rail build buttons/cursors. Sprites by skidd13. --- bin/data/openttd.grf | Bin 31847 -> 34441 bytes src/gfxinit.cpp | 2 +- src/railtypes.h | 12 ++++++------ src/table/files.h | 2 +- src/table/sprites.h | 8 +++++++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf index 627c602bca617e6a5ff9ea7ab15051b89a999922..7dce5a2d3b98df644dcbfc3489ddc99bf8b610f1 100644 GIT binary patch delta 2344 zcmY+E4{Q|26^D0b_k8y5-q{%Ya1#gbkUy+rha#xm!z{*f3^8|C6hfCHGgm972k0l|K(pJ8yBp_Xkuh=;d#VE z*ThIyHNhCVMxI|3UVy@h4^+TN8JVcBau1GNYQ7=3hZ2`okD^tHA?+UCY-mfI(V9p8 zqdj^*s!v>fa%E!AlQDjBVbMRv=WFW|uWviXkBjw*$Ww>-(XvS5BO{b}X#3NAet9G@ zvi%~T|8^v?Z^z&Hf)+_^-T5az-_(*=9DM^7$Hv6~U0FCP@Q6)xn&iVje1x7itzul8nn$XP{CgrJSlX7>+Dif^12$`uu_h zsE2C5pO+=#7?x{>Lts<9yi!q*aH=e+G2I{zg=)djV=Amf9(dSmIaX19jT6>2C%QOn>3Y^d;WcOmCzz*JW z$2ExAb%?<-J5Z*_tPPfK=!OFx*|K7~LNG@RKhI7g1A6U@U=36ntOm;h+lO@vMv=h+ zc#t<2z(4Hw%M9$%tpT5<5A%FOV$ypyo?J!O(VA>7gLDtU?7( ziXk>2HnRj#=H65yNyKm?P7YHzD-cJP^Bei@_>x`#UU!AnH`4{o?kORLEEA`I57c;M zx5R9mB9{Nv_-`kvhgp^^AE^0sFE*S)HEJq+4%3L_*u)ZK%usiJcj4&4<#up(*<9_+ z7f8vn>;SJ@vAIW(L4*HHvfxzhY%`*1Hn(oNg9iVaIUY|la7)cFePsIC3mrptre`9J zVsj_pN>SBK(;eqB2bW(xcCL0jZT}7#b6e2*33KYk)!1vDt_<8@tT%nKSm?EA_qoi+ zjffI2E1EAL+ZQMT{m#Y1MMCEJs!oNCTgzF3-e{qtX3elOj8<)gRTPL>Y7 zKKLdLewx4b!L=!~Bq`Gxq+DBr$oVg?Rq(p513$kCORw!toV|B_oNX2*QFPRzwXu4n zfs7ox&(pTHZEfq}HAu4;;#Q4qGS}EDEakOz9l0Is4^Wk^&i&r5%08I=v&pcgz}nme z_i?+WDHRMyTL(9w!tWG~xSwMcRu89Jr9;hOtc%~DKhAgS3Mc9^x8D{>MdRHIr> zv#Hy4t5MwNFBgk>5kiXpJ&M#5E2cYnt*s5Vl*SRS3xg^`tTd?BTQTu1ZZS2P^zTIsfPuUXu z^!OHc#~_(4r++?2Gg;R)bC69dSR}JA%pEjKY#9-Ff7JF6atpF40~tc7s@Rk{&SP2b zScGrN9!gzKz$fo2brf1OCAl1jJMDmAP(w|x_vkd-sX}91(3#<6yF7-j(+D(Trl$j# z>aYqLSpZS9u{en!eJB8jpgI>2J45~MtDnXrT~wd!)pNx5_e9Nu5zk)B0mEoj4HihC@~; z+8=^OcpO{ZWtD$jb69h{7JHufsW(P*yV>oO< zEsDL`H90U&ClZ4T`{SUv&EXV2B^DZC3Y6P;4%eC2LHQcddbjyc_yt{YNs)O{J4bhV z6*5n&eI6Da-R~vhJh1j6Ffw{f5M`Is5YUO=VE9dI%E0*aeN_@VXJlpT!Da)xbsQU&` zg2M6C(W5#AL-fzr&{ZIS9bVT%@>A&6o>io~mPJ;GKj4vj4v{Y~YE9}F_ zz9XhXeuMmr%|4=vOl%O&=6rE)LB^KJyER@2F)1)~2)z*MFlG9h^)kJ~;)TWJMB5pg zZMAB6fEMgB`^17~!Q^$;I~m<4XV}QHAJD#`f5Oata)*r>(+Q5v`)mSK8Dl2%C(YsB z$vZ)yL%+l5VE~A4Jo#Z#5qF2cNg0Hg^5n|oChiS_9Z2f5Cu^o80@ba6iWN-mO*zK3 zL!d*jLz#(zpS^{4!4*Jm!DN-RtL!U;Is|6`*?-cu0mUZ>E&#IMWk^rHklw`E zq0ph!>9WHFCL%bwJ|l%3_57Nmw`E+J2ig<5|*W{^L1#BIH RD}z>OZD!9tE5OD81^_{tqDBA! diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index b1f22fe3ae..a04402bc32 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -324,7 +324,7 @@ static const SpriteID _openttd_grf_indexes[] = { 377, 377, ///< · small 153, 153, ///< · medium 601, 601, ///< · large - SPR_WARNING_SIGN, SPR_CURSOR_AUTOTRAM, + SPR_WARNING_SIGN, SPR_CURSOR_ELRAIL_DEPOT, END }; diff --git a/src/railtypes.h b/src/railtypes.h index 6695a661c1..d456d66ac9 100644 --- a/src/railtypes.h +++ b/src/railtypes.h @@ -73,10 +73,10 @@ RailtypeInfo _railtypes[] = { SPR_BUILD_X_ELRAIL, SPR_BUILD_EW_ELRAIL, SPR_BUILD_Y_ELRAIL, - SPR_OPENTTD_BASE + 0, - 0x50E, + SPR_IMG_AUTOELRAIL, + SPR_IMG_DEPOT_ELRAIL, SPR_BUILD_TUNNEL_ELRAIL, - SPR_IMG_CONVERT_RAIL + SPR_IMG_CONVERT_ELRAIL }, { @@ -84,10 +84,10 @@ RailtypeInfo _railtypes[] = { SPR_CURSOR_SWNE_ELRAIL, SPR_CURSOR_EW_ELRAIL, SPR_CURSOR_NWSE_ELRAIL, - SPR_CURSOR_AUTORAIL, - SPR_CURSOR_RAIL_DEPOT, + SPR_CURSOR_AUTOELRAIL, + SPR_CURSOR_ELRAIL_DEPOT, SPR_CURSOR_TUNNEL_ELRAIL, - SPR_CURSOR_CONVERT_RAIL + SPR_CURSOR_CONVERT_ELRAIL }, /* strings */ diff --git a/src/table/files.h b/src/table/files.h index 40b2645f80..8ece007354 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -59,7 +59,7 @@ 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", { 0x95, 0xe3, 0x09, 0xe4, 0x2c, 0x2d, 0x47, 0x80, 0xd2, 0x09, 0x06, 0x64, 0xaf, 0x20, 0x32, 0x14 } }, + { "openttd.grf", { 0x16, 0x5c, 0x0f, 0xba, 0x63, 0x6a, 0x77, 0x30, 0x44, 0xb0, 0x32, 0xe6, 0x4a, 0xc7, 0x90, 0x58 } }, { "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } }, { "roadstops.grf", { 0xa1, 0x5b, 0xb3, 0x52, 0x60, 0x12, 0x3c, 0xb7, 0x7b, 0x73, 0x09, 0xc1, 0x1a, 0xb4, 0xd0, 0xb8 } }, { "group.grf", { 0xe8, 0x52, 0x5f, 0x1c, 0x3e, 0xf9, 0x91, 0x9d, 0x0f, 0x70, 0x8c, 0x8a, 0x21, 0xa4, 0xc7, 0x02 } }, diff --git a/src/table/sprites.h b/src/table/sprites.h index 9caff36f2e..39fee27b8a 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -47,7 +47,7 @@ enum Sprites { SPR_ASCII_SPACE_BIG = 450, /* Extra graphic spritenumbers */ - OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf + OPENTTD_SPRITES_COUNT = 122, // number of gfx-sprites in openttd.grf SPR_SIGNALS_BASE = 4896, SPR_CANALS_BASE = SPR_SIGNALS_BASE + 486, @@ -1242,12 +1242,14 @@ enum Sprites { SPR_IMG_RAIL_EW = 1253, SPR_IMG_RAIL_NW = 1254, SPR_IMG_AUTORAIL = SPR_OPENTTD_BASE + 0, + SPR_IMG_AUTOELRAIL = SPR_OPENTTD_BASE + 116, SPR_IMG_AUTOMONO = SPR_OPENTTD_BASE + 1, SPR_IMG_AUTOMAGLEV = SPR_OPENTTD_BASE + 2, SPR_IMG_WAYPOINT = SPR_OPENTTD_BASE + 3, SPR_IMG_DEPOT_RAIL = 1294, + SPR_IMG_DEPOT_ELRAIL = SPR_OPENTTD_BASE + 120, SPR_IMG_DEPOT_MONO = SPR_OPENTTD_BASE + 9, SPR_IMG_DEPOT_MAGLEV = SPR_OPENTTD_BASE + 10, @@ -1259,6 +1261,7 @@ enum Sprites { SPR_IMG_TUNNEL_MAGLEV = 2432, SPR_IMG_CONVERT_RAIL = SPR_OPENTTD_BASE + 22, + SPR_IMG_CONVERT_ELRAIL = SPR_OPENTTD_BASE + 118, SPR_IMG_CONVERT_MONO = SPR_OPENTTD_BASE + 24, SPR_IMG_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 26, @@ -1335,16 +1338,19 @@ enum CursorSprite { SPR_CURSOR_TUNNEL_MAGLEV = 2436, SPR_CURSOR_AUTORAIL = SPR_OPENTTD_BASE + 4, + SPR_CURSOR_AUTOELRAIL = SPR_OPENTTD_BASE + 117, SPR_CURSOR_AUTOMONO = SPR_OPENTTD_BASE + 5, SPR_CURSOR_AUTOMAGLEV = SPR_OPENTTD_BASE + 6, SPR_CURSOR_WAYPOINT = SPR_OPENTTD_BASE + 7, SPR_CURSOR_RAIL_DEPOT = 1296, + SPR_CURSOR_ELRAIL_DEPOT = SPR_OPENTTD_BASE + 121, SPR_CURSOR_MONO_DEPOT = SPR_OPENTTD_BASE + 11, SPR_CURSOR_MAGLEV_DEPOT = SPR_OPENTTD_BASE + 12, SPR_CURSOR_CONVERT_RAIL = SPR_OPENTTD_BASE + 23, + SPR_CURSOR_CONVERT_ELRAIL = SPR_OPENTTD_BASE + 119, SPR_CURSOR_CONVERT_MONO = SPR_OPENTTD_BASE + 25, SPR_CURSOR_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 27,