From c075eec224f081bbab00aafd8781941afb1155a3 Mon Sep 17 00:00:00 2001 From: Xkeeper Date: Tue, 5 Feb 2019 10:10:52 -0800 Subject: [PATCH] Update sync icons, new multiplayer toolbar button The multiplayer toolbar button is the same globe used for the multiplayer option on the title screen, since it seems like a nicer (and better?) looking option than the two riders. Also conflicts less with the new sync icons. --- resources/g2/icons/multiplayer_desync.png | Bin 264 -> 976 bytes resources/g2/icons/multiplayer_sync.png | Bin 267 -> 972 bytes resources/g2/icons/multiplayer_toolbar.png | Bin 0 -> 910 bytes resources/g2/sprites.json | 5 +++++ src/openrct2-ui/windows/TopToolbar.cpp | 4 ++-- src/openrct2/sprites.h | 7 ++++--- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 resources/g2/icons/multiplayer_toolbar.png diff --git a/resources/g2/icons/multiplayer_desync.png b/resources/g2/icons/multiplayer_desync.png index 899cfde22699474e7330cffaff887efde0dfbf48..43e989b94527281f44eea97b532293f16943b138 100644 GIT binary patch delta 955 zcmeBRy1+g`xt^IJz$e6&0WT0&R#rAP)^~Qc4-WQDPL3`v&TnpRo<4p4`t{onAHID1 z_WRGDjrAGqtr`5ixuc_nv$N&PtM%Kvt*6iSU%ozm_x|G3=ezGeUhJ&R9&XK@?=4;* zF5jQ5KEK#_bA7Y({^{YT*XQ3p-v0dd;_vSdyGt{~YcrJFGxP_uFVAP+-_3u0x$x)H z(*K|9|Nk8S|9AiY|A&6z{fGZ=_SY6pHkU4U*X|CtUY_i{yEyoKbMp1+#gA7vzu!Oo`}x)XA0OryHdogU zH#SeVcP{Q2j%Z@+)}^85Gi|1(JEGpJ8zH(t)~yjwc>w08P^ z=k~|Zi=UV8e&2uj^ZMt%uYdo~tB85kb3GyG>~`0wxhzqc#(WU-wsM$Twz~Y|pUWo#D1W!~bB0|M}wo zyN&-Z_W!><`~T_o|F;)2fFj?V!P}W3+@C!=S-iendvd?~^2N!!cQ>Cuzxw&}^Z)d)o7zfV8?d;9(W*WarPGnmV>yX*5u+skJM z8&{`$_t$4Ho?O3s_2l!1S3kdf`2Xko=HA}_w=?{|&G7#}1ABHddv>yVf4g*ZHG6il z`RwWDv!~B~{J8k^Y4h3Boui|Jv$K<{tMiTZo6Ys7+Z(TTHs0^8f7xIAdARcbc=`YJ z>h=F;8~@*K|Np!<0|Ud^`wvzzFfcHd1o;IsI6S+N#=yW(=jq}YA~7}f+(F)>3LFiI z*FHR$$?0`zt;Gh0a;qNW6I%KG?6bCQ`^$f%#!$oIiRFSr#@FZl(mud%yQ`W%?P;iQ zXmF(TeJif8+}u)Q?p$Td_-}`+^27vr@9J+4=`k^xvaRUX4_OATYqI)%&kUzb2%FD( ld3x~2*HgD${9QHkp#0AY+iKH8{To3U)YH|^Wt~$(6978YqmKXp delta 237 zcmcb>-oZ3Mxt_r|z$e7DfuZ65|Ns9luedwefAg1*%4xa(AG__%QJJ^E{{PEM`kj;K zG}~VN`ThU@-OukxBuB{p|Icuu{R;;J0|R48kY6x^!?PP{3=9mM1s;*b3=DinK$vl= zHlH*D14Evti(^PdTsb68q&jOyV>hC*nX6wGYXBL#IJpFd|&OxO^7ixF4rX9IZGH1K6gtfO`HT(H> t!n1zW)H5xA5c>O-s_ey2b#WKv?Il^;AAIhe#lXP8;OXk;vd$@?2>?bXZ|492 diff --git a/resources/g2/icons/multiplayer_sync.png b/resources/g2/icons/multiplayer_sync.png index bb78f2bc4e8c44895ba29c5b20985b87f2a58fa4..596f876fa3f9cd77afbf21113702d8a91173a2da 100644 GIT binary patch delta 951 zcmeBXI>SCext^IJz$e6&0WT0&R#rAP)^~Qc4-WQDPL3`v&TnpRo<4p4`t{onAHID1 z_WRGDjrAGqtr`5ixuc_nv$N&PtM%Kvt*6iSU%ozm_x|G3=ezGeUhJ&R9&XK@?=4;* zF5jQ5KEK#_bA7Y({^{YT*XQ3p-v0dd;_vSdyGt{~YcrJFGxP_uFVAP+-_3u0x$x)H z(*K|9|Nk8S|9AiY|A&6z{fGZ=_SY6pHkU4U*X|CtUY_i{yEyoKbMp1+#gA7vzu!Oo`}x)XA0OryHdogU zH#SeVcP{Q2j%Z@+)}^85Gi|1(JEGpJ8zH(t)~yjwc>w08P^ z=k~|Zi=UV8e&2uj^ZMt%uYdo~tB85kb3GyG>~`0wxhzqc#(WU-wsM$Twz~Y|pUWo#D1W!~bB0|M}wo zyN&-Z_W!><`~T_o|F;)2fFj?V!P}W3+@C!=S-iendvd?~^2N!!cQ>Cuzxw&}^Z)d)o7zfV8?d;9(W*WarPGnmV>yX*5u+skJM z8&{`$_t$4Ho?O3s_2l!1S3kdf`2Xko=HA}_w=?{|&G7#}1ABHddv>yVf4g*ZHG6il z`RwWDv!~B~{J8k^Y4h3Boui|Jv$K<{tMiTZo6Ys7+Z(TTHs0^8f7xIAdARcbc=`YJ z>h=F;8~@*K|Np!<0|Ud^`wvzzFfcHd1o;IsI6S+N#=yW(<>}%WA~7}h!d}6{3OsFz z+b(A0?RVl{FJLjSM^=s9qRXN_Rnxx6F za!1LMgo#n_*GcZ^n_;&vEBk@+PLtTr7FI%P#=n1A8VF5x-(er`Ahurh&b+*hK9xD2 ij;9uX&;8{1e)gMZi`);Vr#&?VWlm35KbLh*2~7aelc+iX delta 240 zcmX@Z-pw>Yxt_r+z$e7DfuZ5;!n!N7W27|v%B@7G4nJ@ErkR z#;MwT(hLj?d7dtgAr*1Cr^1B}EAY4mer4K`@_%-3;+rFxZ~xhxm2_NxAi6ba|A$4z zQ-n5ZK8&2YO+;|zqj>i&r;yh-OSzZ!weZh3Wm@X)%zvHXfgET0v-96mA0E9cw&Uo_ v`6t)jwXLm6E#9tvI4e!tCVTDwI>x|z%o{5UuO~4uFfe$!`njxgN@xNAZF_7} diff --git a/resources/g2/icons/multiplayer_toolbar.png b/resources/g2/icons/multiplayer_toolbar.png new file mode 100644 index 0000000000000000000000000000000000000000..4838985f304d5477120cc73fdda76202f78d6dd9 GIT binary patch literal 910 zcmeAS@N?(olHy`uVBq!ia0y~yV2}Y}4rT@h2G`5_%NQ6KSkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7>)(_gt-1^ z_&@vc$}(AK79H1?d#wFpZ|P+@%w)F<%`?r$4}lJ+<*D=_S@;_ zpD#~Np546Kd;a$P^4;&F7e7DzfAitnll|M{i)TAeKE8bZ{PXYM|KEPT-rl)9x!>Bk z{jqhi_x$zi!|RRn+x^SS*K4QWXE$DM9~|tRY#yEOEFFBh`TY6r`^60E(~Zs3gM+*I zop-BihwD2#C(kZtkj`IxIzGR-**aL;I$k}xxY#{k+dDbAdHVF=?Cj`hVSRVy|Ns9_ znQ!dNz`(#*666=m;PC858iKMO@nAm9xun z%iVR~>qD(MPrbS*zwg6)%kyUpd<1$dIo0)+AAIg}G4e^G$h_n77yG+a+yW(hm3o|e zE}bsVaT7XqL$X^<@%fKGTD_Ym#y)R3lP~bx-Y|Ji?7}r3-Qj9p4O7zgJkpb3?z#U< z&uhWSKjBXm5C1Sa9WaM4Dfa%epOef(O%tZfP0M)4eR^ut^zE~KFIRB=;7hD23ctgg z6CP!gV=EIg%}}EIyr#qE%WD~a#Jh5=5}Wdmk7>71l-EvKP5myVx4ZIo@oX{O9p<6w zR>3R~G0BFFZ9%5{)|D1-tDMI0x9? zxz7GDc79}>+}~$=S51k!-u${qNBpq9@x9hQqWswJ)wB`Jv|saDBFsfi`23`PcqmbwN;x(22p29{Q)MpgzUx&{_j1_tM|;^(1g d$jwj5OsmALVW0VPB?blt22WQ%mvv4FO#o5Rh8_R_ literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 7f3bac5eb7..1f0a72d449 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -418,6 +418,11 @@ { "path": "icons/map_east_pressed.png" }, + { + "path": "icons/multiplayer_toolbar.png", + "x_offset": 0, + "y_offset": 0 + }, { "path": "icons/multiplayer_sync.png", "x_offset": 0, diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 349180f178..0817612147 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -996,8 +996,8 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) y = w->y + window_top_toolbar_widgets[WIDX_NETWORK].top + 0; if (widget_is_pressed(w, WIDX_NETWORK)) y++; - imgId = SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION; - gfx_draw_sprite(dpi, imgId, x, y, 0); + imgId = SPR_G2_MULTIPLAYER_TOOLBAR; + gfx_draw_sprite(dpi, imgId, x - 2, y - 2, 0); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC); gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0); diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 869a5ca1f5..ff09958c04 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -838,10 +838,11 @@ enum SPR_G2_MAP_EAST = SPR_G2_BEGIN + 120, SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 121, - SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 122, - SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 123, + SPR_G2_MULTIPLAYER_TOOLBAR = SPR_G2_BEGIN + 122, + SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 123, + SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 124, - SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 124, + SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 125, SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN, SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,