From c27fa3636792304eee0079e53898f64e7e8f77c4 Mon Sep 17 00:00:00 2001 From: Joshua Jacobs Date: Sun, 20 Apr 2025 15:02:40 +0200 Subject: [PATCH] Add new icons for the controls tab --- resources/g2/icons/controls_0.png | Bin 0 -> 1028 bytes resources/g2/icons/controls_1.png | Bin 0 -> 1023 bytes resources/g2/icons/controls_2.png | Bin 0 -> 1021 bytes resources/g2/icons/controls_3.png | Bin 0 -> 1015 bytes resources/g2/icons/controls_4.png | Bin 0 -> 1014 bytes resources/g2/icons/controls_5.png | Bin 0 -> 1012 bytes resources/g2/icons/controls_6.png | Bin 0 -> 1015 bytes resources/g2/icons/controls_7.png | Bin 0 -> 1007 bytes resources/g2/sprites.json | 40 ++++++++++++++++++++++++++++ src/openrct2-ui/windows/Options.cpp | 6 ++--- src/openrct2/SpriteIds.h | 2 ++ 11 files changed, 45 insertions(+), 3 deletions(-) create mode 100755 resources/g2/icons/controls_0.png create mode 100755 resources/g2/icons/controls_1.png create mode 100755 resources/g2/icons/controls_2.png create mode 100755 resources/g2/icons/controls_3.png create mode 100755 resources/g2/icons/controls_4.png create mode 100755 resources/g2/icons/controls_5.png create mode 100755 resources/g2/icons/controls_6.png create mode 100755 resources/g2/icons/controls_7.png diff --git a/resources/g2/icons/controls_0.png b/resources/g2/icons/controls_0.png new file mode 100755 index 0000000000000000000000000000000000000000..e410d696f41abc71f4133f238b6c93cbaff8ab99 GIT binary patch literal 1028 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}!!3-pS-MOj_q!f}pf_xbms?-=58d`v&K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C$64@Ck7R(#_MSCs$WT7Z(R-XFEqnFP>ZIjx|L6PnzwiJ5|G)O*mn`-)ZB|n=X6LIa|TW43yUb*9OQw{F)?y{9R&W%X^>RdR1XR;SJgeE<8$ zpQwZHzpPG~=e7Q|#KZ|}?JblFHa**TZRXk=GWO;@iC13!4VbB&@tI}g#MPz=5hZQ% z?o+E?ez?Z36Hzq7Rs3}gk4S(G|K{$a)dAfuaV zr3$68+AZHMCBBdJ+VS)L$FQ>NzP~45toc;m%PDo4^I?59FxYuZTq8=H6LV9G5*Z*= z#{c&(ff5oR375o@R0bmhBU60?6MZ8C1w#`n6H_Zwi)U@iLV;>jL26QfYOIorQejGU z4NP>63_=VItxQd=49v6*46FPnaO>$=YS{zS69>}cmYI{v;A|BWTAW%`9OIQ=oKc$Sm6)8LR2<`ypIn-o znpaXB|mRUfT71=aARuA2B45INGJ%XB(*36=wb%2@AV9g6;$nZ0j0S?(!t58 nd8rIw@~L9%G@!5mNEo3W7+^p&`-oTwP>#XV)z4*}Q$iB}iy(&p literal 0 HcmV?d00001 diff --git a/resources/g2/icons/controls_1.png b/resources/g2/icons/controls_1.png new file mode 100755 index 0000000000000000000000000000000000000000..8fb23065203f742f119d3a01ce441a8ee3aec38e GIT binary patch literal 1023 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}!!3-pS-MOj_q!f}pf_xbms?-=58d`v&K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C)pg@Ck7R(#_MSCs$WT7Z(R-XFEqnN9Q~1J3B9) zTz~oY?fL81?_NE*I^FyH;nn^1+1n2v_D)Xz{{C?L{CIP3@AscSTL)`Dzr9%5*!cPF z!{W-y`tHjAKi|LqegFUe{~gw){{@=PSQ6wH%;50sMjD8dIPB#O$r}S4&+yeTzX- zI&HS#T=7Ry+PBwTsNd4Y-)yLMQ{wui|E<=nw&8MWi%wKW-Y-`(UR9cP-+uOoxpiVM z*IwDN^_jz_pYqn6A{<|eePY$w_WV> zHS;-{eemR((;Zw-1ZU4YajIOPpMTl3=LRoIzj&HdKAE&+Yx?KSFYGq)qZD3$!V35I>n}ebuH$NpatrBcDOoI``Y>0;1Ijx|L6PnzwiJ5|G#BFS1r(J#*!evUYnK>+u>_84@fk$L90|U1( z2s1Lwnj--eWH0gbb!C6aBEq9jIPa^Je#99B2{yyQj+GA%xZ(hrB2qGPkRN0(^PFGEX03u8O5vI zi97Siu5#=0V=9sl)Mqy?|95Oj{mrG*PfdMbzx#{ISNm#i?aKINalcc}_?t0_%0$#S z_B@KYaBugo$(Mc_vhA~ESut(Kx3Ygrr*n6e@pej<uM-7{Zgy%p9A+@Sta&6ZAjGvhBt4CYeb22Vs2_tA_IiV`2YSTP(lJE z;gVRA%3x$*WU6mqqHkoNU}$1xVrpe-Ik9otVW1jSkeU>r8mr`@RG3m-0~1{%gAhYQ zD^pV|19NQy11kfA4946X6b-rgDVb@NV6$Nwj38!1G}Im!eh$>20k@$fGdH!kBr&%D zw;ruaMixLlaUeZznK`Kp&Q>v@#i>QbF<$w_8KsF{iOKm%#W61V$)&lec_qa$?wKVS zrAaaV1*v)NMTrF&naRa5Mad;bF`3EvdBs5Sl1vbt5254B3=GWml5$e>Ql6H~uL9b{ z4z{TX7E@lAxUeC~2LDg;-P?{Sg9h{t+m&yPppDM;q g0}2a(gc0h20cK@jRC=ns0w~Ae>FVdQ&MBb@05)iQj{pDw literal 0 HcmV?d00001 diff --git a/resources/g2/icons/controls_3.png b/resources/g2/icons/controls_3.png new file mode 100755 index 0000000000000000000000000000000000000000..1383bcaa336f41f054cb47d645a465734b583ec5 GIT binary patch literal 1015 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}!!3-pS-MOj_q!f}pf_xbms?-=58d`v&K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C$5}@Ck7R(z{nrPOh$wE-ntv&UTKDUOc%zI^S8} z*?Io@^_OqoZk|59I^FyH;nn^1+1n2v_D)W2pCAAI{b6%&Z)IcS=eHL>zkOI-Sy|s* z`Tytp_rLG||Np=F(%5jIxr`-2e!&b5&u*lFI7!~_F49a1SC#-doCO|{#S9GG!XV7Z zFl&wkP>{XE)7O>#C5s4;9>dkjvQWoE0QjDJYsZHd(y;j z_pZ)A^;G7nfhEg~wFYm$rqri9URoC{#CZ4huc(>ZJ#Dx4pFjKKTwP0#U&)QA?wp-p z<=wq4BA#zMcw+4~%ROc}XB!^YhD(ZGDQwy{S6M%D^N*P|_Z=Tx5Ua@u+i=FDiT~Qh zo|TTAH)4eHzcb7eUv_%K?TZ~eJ>x|4eS z`|XcPc)Y}KKT-eBFjrWji8(?YoPbJPBTAeTb5n~F86Z@~|MxF}u^<7Ga7iplWiT=@ zGSxRQ(Kj+sFf_3;F|#r-XrEtt2B=0Aq$UNZ#wxie6{b|zz(m)`AjHtn%GA`#z(U)= z0H|S}r)(>VhTQy=%(P0d*)R=85VIi~ygMET12t&CZ79jiO)V}-%q_sJM`rG!9-y8$ zkRG?poKyy9tC-N@)S}`Tul(YS(nPPsm3Y literal 0 HcmV?d00001 diff --git a/resources/g2/icons/controls_4.png b/resources/g2/icons/controls_4.png new file mode 100755 index 0000000000000000000000000000000000000000..8844ffa2e9b69c5937ec2d839719eb3e02b07e59 GIT binary patch literal 1014 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}!!3-pS-MOj_q!f}pf_xbms?-=58d`v&K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C$5}@Ck7R(z{nrUOc%zy0|zvJKH%rTHo2ZdHVG2 zhYx!vCs(I?n|pg-zJ2@r;nn^1+4I-0Pp+>1{{C?L{P^g6XJupK=eHL>zkOI-Sy|s* z`Tytp_rLG||NplvTisR9pc0P`^q6At$cZ~y#n zKi4;X-b^!oyB%kEWi*aVWcD}mPMTPlab4xCxegfG~v*hP<|A_s|^>y-# zEnBv6XWg#fvv|Sgr`sl6H`Dq4B~^xP=l8=`)K}Cscj{knI6P_dkHQI;mg>6Y&4?)e zFroYGZ3o6TFDHxrVK4b-u($5$i|d7JtxVT+dpo^~y}j?%;=_@<-zK={)L!|ucI}<^ zr4OIkACI=Y$1CUd>0~{lotn7ag>L)Jz_8{mag8W(PRva$N@Rdg8UNqE1WHJNBwP|p zQW=a4j7;?nO!SQm6bwzQOw6nd4BF?Ho&l;+1*u5^syepz zs0XMg4y4B|Gbfe7*(xTqIJKxa#w))#qcqVgF*!e}IL0MEximL5ucSD}J+maEG%3cv zAT`guD6t?TGr2gXD7nNaCNnuduNWv^k_n>oA#{A1fq}VRQch}K%F~khRY05A!8R2E zLyy7a{tt(hKp|m}P!Lc_YEcN##SCEI>lqp=sM_rUN^^sxgOgM9QW?PHQ^nY6Kw$xp cFhV^rz^n{R=B&H~%)kr`p00i_>zopr07p=Xk^lez literal 0 HcmV?d00001 diff --git a/resources/g2/icons/controls_5.png b/resources/g2/icons/controls_5.png new file mode 100755 index 0000000000000000000000000000000000000000..ea27909ea5b1bd2491a3f90c2da0e85c000ab62c GIT binary patch literal 1012 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}!!3-pS-MOj_q!f}pf_xbms?-=58d`v&K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C$64@Ck7R(z{nrPOh%5PWSdsPIiut?yt|*cXpn? zetmRt@#4w#&C{n}zI}W9;lt+-uQvDg{{H@O`~3LmeCPL{KPwv>Kfk>=I6M3K?Ze{A z%KGlg|3BZq|9$`e|NnWJ0|bFaGnNGT1v5B2yO9RsBze2L$jo7JWCwCM3p^r=85p>Q zL70(Y)*K0-AbW|YuPggY77-pj#zl2*Ku0oqc)B=-Xq->I6gX{(0uO6|0t<`DBIc() z-~WBTslVd*yj3+-m5fcttUk$D_zA1d@BaST=}o%e#%r?<#Hh`$@H_MQ%tjsI%2`)k ze9qmp)Kg|$FeQA=B&O9@bE3~3N!04pc>iYa^G!O37r02fg6pE!M;+m{fx*mM;u=xnoS2(hl*j;~GXB4R36zikNw_4Iq%s&8 z7@6uDnCKfBC>WYpnV4A_7=D=H8U<9N3R05-RAZG~lnPU-Yha>lWDsI#Xk}_@Wnigo zU|?lnU|}a_h@v4kKP5A*5^Oe1gAv4Rh=#ZSUpxnD(16=el9`)YT#}eufLqV5S0^oi zdg4HO+%j`g8Jw+RLW@(2ietR;i!(|Sy%Ll2lZsz*Q}arSW85=KGD?$T{0ma^ z+=~(mGBT5kV~UbXjAAmA^Ye;<;w70NIv+yEml+tC>m}u+=A}F>nO_C8i5+ZH5is-^ zOjrCbum=hWgM@;BN>YnLfG%bL`(Dq`SV7fp7f_lTBpsZbnwQD|CZ8(CP6G-HfP@k1 ZfdOV^VETI9quW3^22WQ%mvv4FO#oMRf#(1K literal 0 HcmV?d00001 diff --git a/resources/g2/icons/controls_6.png b/resources/g2/icons/controls_6.png new file mode 100755 index 0000000000000000000000000000000000000000..dbf996cb7cff523b0d76d97ac08593d7d61bec4b GIT binary patch literal 1015 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}!!3-pS-MOj_q!f}pf_xbms?-=58d`v&K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C$64@Ck7R(z{nrc8-n?&d&BuPQHBmc7J_#biVWA z$@TNsua7P+POh%re)w>8y7&3RtM#3o&Aq*wr%(U>{&4&J_~*9|D;pa>zrFbW_x;wv z+TO|L;>ybU?#loF|9^G)NDa_v#*!evUYnK>+u>_84@fk$L90|U1( z2s1Lwnj--eWH0gbb!C6aBEqA`xTwwz=txFyPZ!4!jq|COE|xVLa4=kGFmzPDvBGor z+yDQIC)~KTcFtn`a1IvP2M>-5Ok8G>?DgV!>sM7Jh6haRP9N#<-t|yrN1N*Tx`;C_ zGJzhMXJ>7!I{7C3(t5X(S+}2ko7)j+e1rejhVM~1nafV?G0tZEa@k{r;Bu9_2X?NI zxsh~=Ir-RAqu$w8E87Lar5Nv>WlBE%^g!gl+tGEWK4hN%f@QIH~r5+w)DYE&QbtY}^@gTW1F^Yc! zv$7l4zn5oOtNZEP#Vc9u?u@H-t?qn|x$^r(OzVwFrDf)G&TQEqA)B)K?;{(L*E56# z-=;*HpJNEUDtfm(bLv<76IWuYXXVQN)w*~r_fEF_Y`N-^(7f%9r}nBQ;SOya|>|m+4btA z1yD~MNRL})PAY@5RZM7cYEf~FSAKCuX`)wRa(+^Aj7xrUX>Mv>NpXyOW=TeAQjC8= zYMy&hVnIe`a&b&ia*0t)W^#UBF;KiD6GZ1j==d@N19QEkoYcIOrzP{NfHtv%Z7KqW z9)p?TH^o+03?REjBxk1vw$*Fm%3}Eu9V(c`aumDIH bp&l4uRt9E8%Qq(ipMGpCnq;gpFV&6dgtiq%eQYw z=Q~Fi7jHj&xH{eY{NdHRS5NM*&rYtc4$jUt_xAq&{&4&Jcx7Yb=eHL>zkN76*w{K) zTi;#z{`dX=|No!4_v{Uzxr`-2e!&b5&u*lFI7!~_F49a1SC#-doCO|{#S9GG!XV7Z zFl&wkP>{XE)7O>#C5s4;9+P#scpFfUo2QFoh{pNUOVN{B6nIzzlnom=6SOTZZ~ouv zrxf+AS?lkE3DE))2_+Vc7oRwnG@Sc6^JJxrW0_hLYZO1(^;r175zALIVsOxG zac}kU5tQ5I6_6X-p39tY%Gj-Jhv9CA$2RiIPOS-+a?ndiQz|N+n3pNh6qTlThGU!R zto+L#E#?+WsMn{KZFYQRX0*8GmUr#JFS+5iPXD&O+92W{rhm5Qr`eGe&m-piW76=< z_C2-IDKKdQx#9{%bPFl{MzQ~ufwNwr<$LADbfGy_mv-^ zPo_G*ob|&}?X;M!Ozh5E+BP9V8${n%xt~7CBc1+Y&AgPYznAU^xxGQi;ay!p)~Z{p zT34xx*RtR8v4~g{>u#?RY5qm_KxEe68{gNR+8cRFcJ{=&?ON^Kx9=Z})hv@`jxN(T z`^WxIM&i7tXYhSsAoG^EMwB=w=B5@UGC-(||LyA;ux3wQPgg&ebxsLQ0B6B(TL1t6 literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 2f2b703efe..f0957e4624 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -443,6 +443,46 @@ "x": 3, "y": 3 }, + { + "path": "icons/controls_0.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_1.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_2.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_3.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_4.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_5.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_6.png", + "x": 1, + "y": 1 + }, + { + "path": "icons/controls_7.png", + "x": 1, + "y": 1 + }, { "path": "logo_mono_dithered.png" }, diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 108f28117c..1be4b3fc66 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -2163,7 +2163,7 @@ namespace OpenRCT2::Ui::Windows DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_CULTURE, SPR_TAB_TIMER_0); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_AUDIO, SPR_TAB_MUSIC_0); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_INTERFACE, SPR_TAB_PAINT_0); - DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_CONTROLS, SPR_TAB_GEARS_0); + DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_CONTROLS, SPR_G2_CONTROLS_TAB_START); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_MISC, SPR_TAB_RIDE_0); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_ADVANCED, SPR_TAB_WRENCH_0); } @@ -2259,7 +2259,7 @@ namespace OpenRCT2::Ui::Windows 8, // WINDOW_OPTIONS_PAGE_CULTURE, 2, // WINDOW_OPTIONS_PAGE_AUDIO, 4, // WINDOW_OPTIONS_PAGE_INTERFACE, - 2, // WINDOW_OPTIONS_PAGE_CONTROLS, + 8, // WINDOW_OPTIONS_PAGE_CONTROLS, 4, // WINDOW_OPTIONS_PAGE_MISC, 2, // WINDOW_OPTIONS_PAGE_ADVANCED, }; @@ -2270,7 +2270,7 @@ namespace OpenRCT2::Ui::Windows 8, // WINDOW_OPTIONS_PAGE_CULTURE, 16, // WINDOW_OPTIONS_PAGE_AUDIO, 8, // WINDOW_OPTIONS_PAGE_INTERFACE, - 4, // WINDOW_OPTIONS_PAGE_CONTROLS, + 8, // WINDOW_OPTIONS_PAGE_CONTROLS, 16, // WINDOW_OPTIONS_PAGE_MISC, 16, // WINDOW_OPTIONS_PAGE_ADVANCED, }; diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index 6f81bbedd9..740dc59c3e 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -985,6 +985,8 @@ enum : ImageIndex SPR_G2_WEATHER_BLIZZARD, SPR_G2_MONITOR_TAB_START, SPR_G2_MONITOR_TAB_END = SPR_G2_MONITOR_TAB_START + 15, + SPR_G2_CONTROLS_TAB_START, + SPR_G2_CONTROLS_TAB_END = SPR_G2_CONTROLS_TAB_START + 7, SPR_G2_LOGO_MONO_DITHERED, // G2 Loading progress