From 6ffb03dde011bbde089facbde7369f7205710386 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Mon, 13 Sep 2021 09:29:46 +0200 Subject: [PATCH] Add icon for path railings tab --- resources/g2/icons/path_railings_tab.png | Bin 0 -> 12466 bytes resources/g2/sprites.json | 4 ++++ .../windows/EditorObjectSelection.cpp | 8 +++++--- src/openrct2/sprites.h | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 resources/g2/icons/path_railings_tab.png diff --git a/resources/g2/icons/path_railings_tab.png b/resources/g2/icons/path_railings_tab.png new file mode 100644 index 0000000000000000000000000000000000000000..ffac83ff405c25d2fbfb77914e2b006610416c66 GIT binary patch literal 12466 zcmeHtXH-+$*7l}1=~Zd~HMCGe2ScyYL6B+)p@-0WF9Om*5dkUEyC6l1f)qiN4x)f` zq<0WSA#e1Yd+xd8d;i=qzW3kRWAB}{*P8R0b3SYCm8`54udl04PRdLQ006nBhKeEf zlMQ=aCC0Py zyy(#+tVye$Qn)XptS^61&_5QJaF5v2vhy!)w|wd<6=kqC9EO?p!K7fS*LFNBhT0yl zcg}gGMA>9xE?M>+4!&RfysQtqNfs8e5OaB~xLVWea(?+~XZ@Sae(VDHn>AtQL)eq@ zntaMHHn5HF>pyqV;QI^OiO|l=?H`3dcQ5j3+ZdN&R?;>33(GbObr*hxKd%p* z2kpD<%^!dMJfNnryIvaldHF{Y9+*>a-{npI;6nHQ>BZ(xr{pcG;@}@^;IP{poavb? zo*&`SEW<%o@cLd>z3PrPFEk#^yHvbkH$B>0i-#?}$qt;UNPDjuNW1@L!G&bM?ZV0} z=1q*>;sBG>okfG-L~attQ|4Nkpwn~YEG(t zwNOH^GgK$H81#TfvMNz}3?klK?sEKudA`2BcONC3pz^@3B0W2gu$AVS0Zd%d+3|s~ zCvTq?q~=6a;7+rx{S-6PL>5$Cqj+elo!4NPiwBsz!KBQa^Vf>lbFXCluf%jj20g2ty9@`d}Cz zdue^fq_&2A*|lkC?vr>2J`*jLFxC%wdLgygNIgqcanWD52a`Ww2%{v^JI-rcu05OU zyAKS}?CsSin(w#ObV#1@ZOD2^3~{_4Ej86`JzbM6AT{@TB@#X2~UGI(?8WX z`ne$?ttvZ2)gTC#c3M@9C&aR?N@IVWaF^)Q$bm}Wr@`P3( zll^B{efB4uqTdk=@4|2ImFuoQ`rwf{1PvrHzQ)nTbS;FMgLLD|$1hrZHiFKwC8|ZA zE%(W}{ciF_G1R{V-$%UE2Z!)g+HAgmynn6M?|p}x4EONvNUaRgd=gzDR@3az+0wYZ zr&%)kmf&*6qngx`Mz6upS5M$Bt!z|pHPlh6Sh=p6`L5cLFz@oMM1=2(!o%+gxWOi` zm@eMAd@5{K;@x)sVv%7t+O@|_`GUq{1k``Gf*JaG35T-enuDMDvA?t;2sl}x*k5EI;Tc+M>Pc*kkitXNU6^x4-}vohbbt9)QNGSzM+ zo}ee2n(0zeRdgwmc;xX-VaQq9gtjQ7DGAAdb=Nq?K2o!Z5lXVXC&9aUT`bcTZx>># zUJA||yH?LC%w;!ss?GC$k>hC>1^RCqfL&-}o}tCJriGSwnHlRnHlo^TqjB{cS65rwD4_Fti|(op3krskqoQ4E3ZC$W3b8E za?QFgBO4>5+?>%tArMos049@dj2qVjZLWld2P$0cBD+mkU?fLQfUcDSySOb!ZJE|S z)Wx4NR@g2A%e*&eJuAw2*rHf|Qnx&V=DA=c@Dn_w*B^K?X`o3ThVxT_?*T>NO{ip0 zHrp2SVo%=V#?%4=1R||Q_VafSjOS&lw4N<=oK8L~6r;RK z6S&}5saxfK-Ig^?(B+e=4`(hbnp zNmC;nXK`{mW~uQEYD$6*0Y_RV z;hJ$2)>#@Lo|$pG__ouYLV~phoO0bm18aR(BM10&y?nWoqc6L<-+YX{rR-YE3(w&&Zfw5PfP_)WF+oNu6C0``ZsOa8Ta$vuI*{)QXg(MII(;l$)6h z1y?8tlF9FZIUY#I;4x6u;aYatsftYb;$0Fy{qg#k*uIFBnD&S)H^NV&P@aSs1py-7 z(U>Kc^cThX(F{{P(E@*~Dhz+b*TuFOd>6kd1|c1{p=6~KnD*4Vl0hcHk=#6sYpCiq zMBPbYRUtH7b`=nnZZa=0;66)x@Z+$ONrdLbDAYT6=fW?+z_%MtCeii9rmQ=wHClJ- zTExASCf@c@_4haVMad)ik-Oq>)5R#<5{k4^y`YIG(Q|3mpA`w~bmQ(GbD{;b#Gr5Ui|M8%J;~vDfu|Q@s7>qaWYJsPE#uPt4&+r;4goEnNIGH*U&Z9Tn%e zxHo=f`HDyj9b{mbo`*F3{-Z*q#}HxldxPb|$#TVo>y4>O8WkpEL&i~8W_yLx>48k` zZF<<3*Lu1<9w#@5J_2(L#tL@V5d9tby_>)SA9GOql02x$OtHXQ>Q<+ z$}QDs5)*@Xo=l3t*8q@to51BH(we ztS$CM<*ht9)5MJiDN%6+*XK$V$!|ra?%=FHtqYHQ;+@)XEno2At)y_H%)V21Y6mY% zY0dt^MukU}=6Le%?qoQt{dAylk3MbT>Gz_{A(f9)xAq4H3-qX|^XA?<60yqH6fID7 zdvw_X`)s4%1~N(^^ZHfckoReNC$>N59MrY}<{>s5!_A=g+!8%ABR38D8<`G<$yqG{ zR8(f@^G2}O3of;C`#atl=(GMYxjX)!akW!wvhQuN#_z1#RJk72Q<$8wcRf*0O+FN+*gaVixf^jojNZejfh ze*fKm0$2vzTdhgz(CsesGF1<~JnlCYl&7K+bmh*AngSfUIFfaD+t|hkq4*P%w|?O! zmevQm8$X!z&0TVO`(OS5>_B-~%* zPx_$ap`5sB`R*z*N5`TGjeR z)8O`M74J$;_YGYQx5ik8w6dUG0mg|CL;$A?Vfpy^$+53$i6&?GTbdAFy-DU55o_B6 z9`_??-V8WyA5A^Cw8d<-ULW&(-a9?_0uCCjXQ$gxT%cQwqF@*|G$!hdZSSLBxdVP< z&&E-%ayL7@RV*& z;ojaVEPf4U_^pXzNqY1Vr~J&E zV@;@{#4Qnt`dvbmz-KM=MCA47ce>OD3r-14dwdA>j8a1SUU=ARzQW5BPHG0N`D36L zxg_#2Hh2*tHy;>s+tZqj*2hf|bHi`FE+L5HD<@>%tF$wIM-r4HN64_NXd#<=xfaW_ z6pM_1k^;ke1o?>@y{syI8nn*Pg2YFA11~5@iwvd*bX0nCnj>(^#rKK~ zcr&zt>b8~I&Du9|V`C;)<)?1!JhPVNwqWQQXTUGx6q_U6zRu%>&4CzLZc4eRG(Im) zH4hKPd|@ih7bw;34`Gdpd>IVmIepx?9)Jo*A_eMK6i02^XE-l58^w15lz*{+H znuHZjdyH~Q=}&8)DYGQuCZgM}L?7#I3CH{L3$wRFrZq^UA2CrfUiEaczQB8=lStEj zk0E+a^y_T~3JP_Ct{it<5k&zlzlAlPPXw?18*@RS&VE^XAvMdY3k@gj5@LLP_ezqp zqY87p#(T*%WxVI}a!bi^SBs5Y-bkYjVf5Ex=aRqPgzh|T#i`0#8@l(DyxqxLK|8{6 zxk(xBP2g-K(FHvvl4D7iqUIWi5?xjkdCl~a#>6^XLrHmt%_7p)?3s*7J&81@MOSs& zvnW?tvvPsY1R@h_8n-^)$}kFdoCpQ7V2|5EE6jMG{v?|oq3XCs_Jve4q;~QohBb)z zXGT!O`Cz3^l$0Hmz0g~LLN{Smj%D`+X{(~#Vi4_v3jZXBE{}%vgEL>)2ZIL}(Srb!Q;xd!?=2a6Et ztQ+1_byE$fMo;5@nicZ#Z57z_wh#n`_BlA0HEY3ilY1HgPZC$q$+ZEGPsv*Nu7#9z zW`Ren75DEx?QbQD+9+6io6TEhfWw)h`?%pd0iO1Cg9Zv6B6oM)E5&YQ&LhSxF}sR6 zLIx~xUJ*E#tXgD?Y@nY5Kn5Pbm@=`Jrr?AKWd|@{ie93#g<*A z#coi|`)M|qZ-#7)>79XBF+X}YIs7y5{E(N<@!<)thw13xUCZ{3UK5Yky#<1g{cGST4_6!*svA3(Nrs7W9-b={`zAX?^f$ z#Vs^DBbV$D7 z%Ibx{+>h=gW|Tn_FX(%WT7*|EyZ+44({+`P)@E@d;m^e*z1g=D5+mO)P%*2`0Xl6n zCg7{A{!Wv9r_?lGP+Oa+WX=$k&Qh3%GiWYXBJ4GIz)*JnB)`O=)F9n{#Ka}X$Na5} zz#Rs~`ZyQ7OX|Eg42{-85T!tK%fYw9;Q^{UCzW6>{gHIHfM|jX*TIYpE|(w!>;4&# z!wt^sg`X`;Kkl>0-Z=Mn$FdxvttvW#tD?@ zcYUs`3<{;LP`%;CNhx9Tgvyt;q~3Q_IXv)ITR^X$ReNlZC`5ZxqGJm+(mvyou<9n+ zRA2D5&4~`_ECrV(e;TuVu1Y?V9IkcGylBn_kHwAnp<|K)3jd5ng;IpA>^1$?CiU3u zI_4j%lEMK-C-OLaqm*h&ixTAeckRZ##n&}vL^!!u!igB-t*t6ieBQ0!&T*u=WZq3| zi^=D6;nk>@HD(;x8|XMy1@(Rs8)2Ia6U_BspJpDyjZK1SzfNd}(2BsPrZI;SCC4 zUGJ6P;3Y#JakIbzt$y5N+Mgrrb~Dd#V}fg6N`JXU zNEZ%IJXy$CYHzBEXgz66#J~by>xcRNy12rk+x)9@cSK2RxbHx#183NQIYP0l8$XV? z*X5BhLV>bwjP!odd3e=clbc^fdzQ*x1(^_+NwjKRe2FzWjZT{7v3?*sl?anZ%Sg7M zpP9-IKd0lnW0Se`(3nXSm;C-iPE2=PA}Af!$Up0alTZ<@6OB_%?@boG?$U}W%l*D*tBo9B~hZ+0|3R{Qq-rRh96bPBzOSJo zd2xkKhCYJ4yRS%e6W`r{>mmnmCM5J*(uh=JmS4KZbDUfQp6os-WCH|NSd>u)r@Tzf z&K|JUW$l@}i9#>s|DGSMLDXE@hIR=t*cyP`THDZDkC*+?A%o(@Ppuv&c^eywbs zc_1&3>M`EC`(>4yl==QTQ_}UQqBRT*SsMZTzi4$`;jF zvpumf?96=Z{r;yM5o$JOVdP$}o&1dF!0D4B_JA>|%;8b%8Ht*#*fYb8@2TP#9*cwvJdMPdNdKQbh*vD1E8d% zP3b&2ehj3Am@Dya2oT^M}K|yF@d%xEKBtp<6-8o{pJop{VQv$28AK!Dp45 zg*ftC#I561=remhZ-pj3a5mktN)A8_Vvvg(RZ_Y8K7(2C<>%aQbR;0!1swl=_GmbwKQTamJV`jDxuTuvZJiuGpEv+V~_{;az(x&7fR9=IKWw2 zP*aP(B~|Lq5p%_L6uC$AqbTq3)1wylK_;ZZ$@!q`j3U56Pz#( zE)G&goW;l$yJ6pV7@tUMwkC~vV>s};tfwh^jE=CYpUD4p+0)708}Vz|Q(jAiB3yxZ zHXue1xLEViH8DC)T9vlbf*s=LtgSkvn5y)jh1 zd;kH>4Jb)4C7Vbv&gn-+OKHqCO0HaUZY2Wwa>;Vfs39% zHZIPtT$e#bm9>dfwVcX1<~G|c!HdWn$Y`_n*`e7gEBBnKBHuE8!hw+s6AfqUIRc?!v%Nn1{d`72m?u2P(tF9L@iGVE$ zjS5fs(`ZrGUdJiT`qZZvFH*urPqkMK2TX9e`*Hb3LG7Ujuy3Dh9_HsBq<4FOPL`!O zxE0m~N6V#$&+1p8y5Wmr?j;_7Av=p3QznQ&I#$=w;Ze$W8x=ln-`wAG-rrpi8@dbyC^8* zxlF}%gmv7Nk&aFpfu2aCKwV=*pbJ9Ujth2^RL)-p3xGm;!$JNiS2r&ie|fIoxH8!C zuWBJK&~FiM7kMr-9et28+7k(a3PJ^iA*%jPzM@<=NkMX+cJ?xcDr$d1V4vi<9KF5W zWrT$M{QLy{#01fv4niW*($Yf0qC%pg5Ud2mE5OYg?hkSE;{FBk2ZjpL3*m`PXD759 z=ocp37VYCL&&7pp2mQ-Gl)H}3U+`{Tf3kq(L&zWQE+ir-EQCS{{awS$Th$i}@~1=p ztA>{`cKd*kA<_%&OZIuv?N`h1aQ^NHR{byB|B(Jy?7xMvQaU;^Drkhy zFZVQ6U?aswgH52{(SUeO!_k;)OhW!=fhn>z;w5dS=0QZyrEn`*eln4h02NxF?4-XF?AD@7L zfRK=oh=_=on3#lwgpr$@TTDzySs7+zq>VsWczL0tqM{x>%CDFJr6o!vh^783$s zvVfj8nS}+diwlQekWg%b?4umLvO1ggPOo<(2@5Ml%KSv8vSes&#xPTk6a+ZmOYC`+ za_1w{cXjC5{@C@|qO<)Tbr!&eAMk?#DMmzPXrj&p%IPxN<995Wbs@~L4dzD*2Ghe0 z0D1smLqvq8qzq$WNdbe4WM!Z0>GeA}OoxSS=jUTOJ6XhNxnYb#dK|JgV0ARVX_y!y zMb;}vIjTxKqur?JolVQE1BWDwkUF=l5x+J<(gLlFj@66Jx5;low~U1K%w~+Nmo1!i zQo;aQBY@EX;0OZ1DMXU_jOuk@i%uAN#57^St7t!^2lHHypB5p>;-}7^U@BXNP;U1! z8i_(oKk{0sirVjdbT(3jS?Qsql?3yfib*=al>Lm15)g@jEOi$F5iut^2j_r%W8zt^b%l!;tY)Qc5y1s&jA~@e3hj zWxcfZVr{TsL3Ifk{bhBtJtM~pFu+Ee$jgW_%!VVyg+C_iJhmh7{mPdGg8#ciV*GXQ6nQ&>+2&JtSuG? zKrDz1mcpo4#9`9{M$gKo>|0bF`?a4vdiSGc0W-Z1rUfK9h}4BBEnpljMq)t@+9_c! zMHyl3RT(2aRqL}onBxUWZEZ{ofSCm_7yxSvdxBG9S)zil1<9O8*fVEk#p~TWY(d$= z!pOx15fpUkFSPS3xxEc_jR1u&AF*5B0UTRxbrm3vfK3DYK;o`(2g?E(?XL?5$j)WL zRuXw@>ZlT}5l~$r<2Hv>6k&CsnktIMJR=X&#!x-NS5%t9HAn6yOseeCD1P-R2}a@? z&^}PFfKWAZJjBB;a~uwMX<=+sdM|(A`Lge9OEy0~v^?&7Fr5uEZd#qr_7K~EmZa2W z_h5JE#U=SoSAO$#l;o0R#e1Jm2>A$!I&{5Z*`I8oWy&x$$HUh>{7g!2G~|g%1g=Oz*u;TkC3{Nk{&Jpq zS{;%6Tq!+g7+wrae~Cq;`#v&fsgY qHs*)jA7(?&pFBddtq0sXCyDiIVF;B*V*hXh08Le0m0G2{k^cjjtcr91 literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 6250ec5297..041165287f 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -478,6 +478,10 @@ { "path": "icons/view.png" }, + { + "path": "icons/path_railings_tab.png", + "x_offset": 1 + }, { "path": "font/latin/ae-uc-small.png", "y_offset": 0, diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 86f7cd248d..489f8e85ef 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -108,10 +108,12 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = { { STR_OBJECT_SELECTION_WATER, SPR_TAB_WATER, false }, // Currently hidden until new save format arrives: - // { STR_OBJECT_SELECTION_TERRAIN_SURFACES, SPR_G2_TAB_LAND, false }, - // { STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TAB_LAND, false }, - // { STR_OBJECT_SELECTION_STATIONS, SPR_TAB_PARK, false }, + // { STR_OBJECT_SELECTION_TERRAIN_SURFACES, SPR_G2_TAB_LAND, true }, + // { STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TAB_LAND, true }, + // { STR_OBJECT_SELECTION_STATIONS, SPR_TAB_PARK, true }, // { STR_OBJECT_SELECTION_MUSIC, SPR_TAB_MUSIC_0, false }, + // { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, SPR_TAB_SCENERY_PATHS, false }, + // { STR_OBJECT_SELECTION_FOOTPATH_RAILINGS, SPR_G2_PATH_RAILINGS_TAB, false }, }; #pragma region Widgets diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 64d72de1cd..0965ea5fd0 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -864,7 +864,9 @@ enum SPR_G2_VIEW = SPR_G2_BEGIN + 137, - SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 138, + SPR_G2_PATH_RAILINGS_TAB = SPR_G2_BEGIN + 138, + + SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 139, SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN, SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,