From c075eec224f081bbab00aafd8781941afb1155a3 Mon Sep 17 00:00:00 2001
From: Xkeeper <xkeeper@gmail.com>
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
literal 976
zcmaJ=!He8<6n;`9b(b~BKu1hVggHdaA(SYw4JFlV8Q18hG}{KrAxf}w7}kJMMjA2V
z90r+UglP$Nz!7p7Fz6@?8!(61Mj2typaUHt$P`99hdo3IINC*irvHGC@4fGPm-ijs
zdmo(Nu5YY8wgvzjThDJ^DEU~K4<9{J*5mnc1aJh-zqoU*Z2u>!wOWm38Br7zMKTP{
zvdnh7?RkUIC`^)RmgPmkG9d6EOY53eX*S80&2+lF*O!MQJ&LVK+MO?ak;YVh-IS`1
zO1cI$u-Lt}7<=kuWM<>eGV@n?QYS#Cp(TK;U_%p&yZCHaDJBG3GN{nep^H#b1CRl9
z3^Q@uAqbbEe4gKv<#D4ibDV?00L3xER%$|(kx5>s>L#r^tl{!jUu*|bFH-!89%c=a
zBba)PS7^!LG*dJ?a%Z3qLNiRAB<rQi;d~Y20#p>JHh{E&axrdDt&b=z7R*%b&MiN8
z6SODO6@w#Mb-JtaLqm)#C2bos&sqfSJoZ*;fEEc};V4>VxrQLN6s2nz{Z?z#?Z$&a
z8iw=fG|zJcgb9>~u|r&p2xUSy=3-}|`O8+6yVGK{Je;l2I*sF8wOS`@3e6ZiZ%J}T
zFNfKqZf`ssWl37h1<)nTQgBBn-6q|)g`lHE{l++OW^sQxON!zE2>>d91>gb%0Aqj!
z2B?HABHKcNkFuFefyqKofUpjk3`hZFR#BHlzKp^qnsiX+!~Ml`Ac>&LSktIFExPB{
zhrSU-?KBOR%M_JfL<3lRU2v<iPwF9MX1tqgLD7m<-sCWxqghT>fFrRwgKGlWR9L$q
zxlYsXIZ@C{lVF)8sF-t-ghD_WAOxjX3CisdZMzg)-z(8yEUd|-6r!dn&8A`7Cd;%r
z#uL~;WMhe$%JfpLA)Q1Hh59TC1(ZtV<^M3h^I1s`ym?_;fwOmixm-5yZf!oh^XT>0
ze!RKy-Q!2!d-e7ocWylN!q1;S^Ch%SUuD04(sZ$p_xJzBzkTQA6K8)r_315k_Q^f^
z8~n`IHh%f{i!WVNUMA+J*DmeuzQwNZ)=uevC0AZQ_Q=MsOt^FPscZXh-23|ktld7r
we0cZdwT~_h9-Mm0p9k0Xe>%K!<0kpf+h^>jZ@FLH|I4j&+nZlJ_saYK0a`bs00000

delta 237
zcmV<J022Su2Z#cYBYyxhP)t-sfB=C1|NsBfsNIuKv-I&JW^MoDM!jq#o}fSf>C!KW
zlbnM+)%o}T|GVeh7-Lu+|Nj8Uhx7;l0004WQchC<K<3zH00009a7bBm000ie000ie
z0hKEb8vp<RZb?KzRCr!x%2y7=FbG9as%y&Zf3@>)6ep4I2WFrnC~9LC`qtP(e<$fj
zH*d|s%KBDg=1}FTkB-31wZ7fVpmikW_RZYEBErypx`k%M&~%))6Bs*7E_(;ht`nO2
ne18I`;8pwTB^}Z7eqPZZKN$sw;PZ`|00000NkvXXu0mjfMkjCQ

diff --git a/resources/g2/icons/multiplayer_sync.png b/resources/g2/icons/multiplayer_sync.png
index bb78f2bc4e8c44895ba29c5b20985b87f2a58fa4..596f876fa3f9cd77afbf21113702d8a91173a2da 100644
GIT binary patch
literal 972
zcmaJ=(W~2Z6h5+tjCC`(!m4Hvq0ArwBSeWBG~04Vyk^{tWe~JTHo{i1Zh6R{XdVI<
zEK*p|A{kUH7@@k16}e!p7L5|24?*H6tU?Bz7T1TV!R4XgefXLE10KF}zVE!8@8O*D
z!Kp3jz`n=#0l<OHS2j+Ue5lNa_wFg{;ruWH*aN3do;gvr{}Z)(z0R_XC<>}78%D#j
z%uc7{dBgEIjN@6B<we0VAn>5bl}4l5YLRW5>GpVUpp3@)B(jpUw^;fjjcI(vlxvPg
zx&}40*zJxOd0H|yvuSsg`RhEE2+(P03*f5Q$i$)^J|9(!gg`3>6*}5=5sK>o3V@Db
zCXPD<;Zl^(^V^CtZ8qnQb8k3AQADuSx=>>jlGiE8q&0^%T;3Xpoj~qSR6o(ftVwbN
zBh`78mJP09ie^{o4)tMZhN%;0{d6^2tRq~2stUCxkTy^*#tm!Im}*3VnQFa-<>zjU
zwiUW+a70_8dm2A7#EGS*9b@iU%b=4--Z~A?GRCVMMQbeA6vVcw_6%dtZjXDtXgEy6
za50<Zd5(ZEf$}hRgo_hGP3Y!A>@FMrsy)fwSutMi&ey0y<2YBVNn~B68H497S?TKK
zFniqVPe<b{PK$*Ax{O&W?&zf3q6fARbk)hAISrh7G+52!qPT|y01dzbZ~+2<DZml~
zR6-GvZK1$N*<7K(WT7uWC_$zGQURGY)MJsaps<CKF3Nm(uy_t+5i|vB88xR(_g!h^
z8<R;VO@q}cMWq+f1lFzyZcXt?J*3Qxck@P2v?psX*$o$Ho>NueNK9hzhCsGd)^5tK
z)AIYyB<QDcu*zaoEI3(4A)pKpg3_x5<#vgVT?%gCl^86SR+5xLY&6tX%dl;eWjY+=
z32Y#;k<82#dZpEoP9ldw0~Un>O6BtMe_q_VR?<V4Pj9Jk^zN@0%I4k8jbmpX{rKW9
z-#rpPvH$&ZU*CN5QgpoXg-5^k?e!n`KXdi`?>}9Mvmai%{g3wQt>pUCe|_?sG{0ph
zNA~`G?W3pQ%bm-gpZ)Ol{KjKDSFXPN{adX&^>3biqj>(sgHN)%|GsdrFYO5W(L>`S
sw?Dn~)ya3>zCS&0tuNj`mJj~C`<WCsFZ}V`gP+_yv9)pI_}TaV1Mr2XumAu6

delta 240
zcmV<M01yAn2a5ubBYyxkP)t-sfB=BqlTZKu|GjJ^|I?_m^zmM`dUDB!BW7(wcT_Kl
zlmF?`K4eOT-HO%u_gSBCQ-x!$=CCmRf^+}?00DGTPE!Ct=GbNc000SaNLh0L01m_e
z01m_fl`9S#0001PNkl<ZcwTMFR}#Y@3`J4(0=Q)Vn~h=Y#A)sRJk1$FufSV{V!!aB
zbCeRXDdAa_wiFSm;$KIKLR9P7bql4Agb$xJ0;NYo57z+T9tmgW&-Z2F#oZRT#p$2P
qt=&C+dS!FBC&OxHD?Dqh|9$~c-UG3Dao1u10000<MNUMnLSTYzdu&qx

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!ia0vp^G9b*s3?yAI>n{UREa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC~+*nC&cwX!~fZjAFqG@
z`~Bz7_rLG2Uf;d`_TkI7Z(slZ|NQ6si{JOVFJIg~KYsG=;Qq^>x8F`b|9p9J^6ci-
z-t)KTm+yWbz4-az|C<lrp6uTqUp(7+^6};K=bwN7{{Qy#_4dx?$^F*O?T@XCz2~oA
zA6{>q-|k;tzFs^1KD+U9``}>jWb^2JXX)V6&F9Z|-!EoRpKffP9vs}w@4Q=GJ6zw{
zIeB(DgLMAl)A9Mu&DO!%*754m#l`OV+TO{@&C{m`XJ<!83+uZp|NsAg%6wy>uNfFi
zg8YIR9G=}s196hP-CZ0z@8$RbIh+L^k;M!Qd`Cc-ajG_-G*FPe#M9T6{V@}(peeVd
z?55>FJ&QeE978nD_fC2nw%9<RZQ`wtH7v9FC+=d|6>({cSI#cSEqB*_uMf56JoW0L
z{JszGEzh4Z@Db>-<W$#Ne(<@^#mFa#BJ+;RU+nKzaSN32RqAo>xpcZb$4%(e4asgb
z#pgf%X!UNM82h~COuoQ#d&A^8u?yFDbcd^XHB3p{^GHvEx##{bJ+B2P|AaqPJp9Ax
zbif?Gq}cn<eoitEHBFc@H!b5G_vxuo)3?v|y<EZdgD<hBDEtm{PI#0}j;&10G((B*
z^O_EuFRx|z5%0>eN^HtMKBnD5QC>S`HTAoc-tNlV#k0k9cbJE!TLrT~#3UOwwgs8)
zTUT1VwL0ISoo%vZ>g~79i$fnP_$oY+Vl&!SA9QH7ae$=&J7*=^<yZUeGuO`DF|(?7
z!k-7HzwN!Xx>?(%_(xONRryKJKg_)~<KD__&6wN1kG~$j;~Zdn=Q{ht*!huha(|!g
zT{R`@dh_cd9r45Z#`jvc9Xe~XWZiwegN|Rr-`>@eneL?1_jv9M@c`e~O0i$w{djk%
zOn+}<?v@XSlHY!MT$q)-^{VchOHrSX#zsG$|DgIOd+k-fJ(E49?gL{`wZt`|BqgyV
z)hf9t6-Y4{85mmX8W`ysn1&cwTA3PI8JOrASXdbtoX?7%hoT`jKP5A*61RqZ=FgRY
P8W=oX{an^LB{Ts5QPGAT

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,