From 57040c392c0c475cdf1dde0188fbdb08db51f933 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Thu, 2 May 2019 12:32:45 +0200 Subject: [PATCH] Change multiplayer toolbar image to framed globe, with pressed state. --- resources/g2/icons/multiplayer_toolbar.png | Bin 910 -> 1240 bytes .../g2/icons/multiplayer_toolbar_pressed.png | Bin 0 -> 1235 bytes resources/g2/sprites.json | 15 ++++++--------- src/openrct2-ui/windows/TopToolbar.cpp | 9 +++++---- src/openrct2/sprites.h | 9 +++++---- 5 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 resources/g2/icons/multiplayer_toolbar_pressed.png diff --git a/resources/g2/icons/multiplayer_toolbar.png b/resources/g2/icons/multiplayer_toolbar.png index 4838985f304d5477120cc73fdda76202f78d6dd9..a2c9e734fa45a8d3dcaab8742dfd6b4367d184f2 100644 GIT binary patch literal 1240 zcmaJ>@oy7#6#ovCB6D`qV1+{~l;kE=FK{e3DRRh-l%>lKIbto{a*%^H(1b%yD6`;2 z8fc`!i>XN&6>D-}A)Ov(W(}0Az~Poy$pIx+J+XljDo$6Vm?|ZHJ^le-KJUHH`{jLJ z@?PEtYkFKQGv>?y0JLq%U9$r)rM{+n-72H}AG6x+b{xkjiewl! z$N2<-4~N6?cv4X^s#?(XYORK2fOG=d-R$#O0s&hvghisxc!EwTY&Iw4wP>j1TarU770Cf;lo5kx{!+36gn>2bfmD2fxwB+TUy++ruK7;SU1sEc=aM4XeHLV^mX z-LWhq=h=+zw-E^DvO5`vnq(aVXO; z6M*>$)MfB!@dR*Fz(bn?oK*}uVv;K*bJ=WI)6$iS1`RF55AaYkDOqXR#%54ncS==X zx)#jV+9OIomaJ<3oBZu-CYh^+jrdk=-B0zo34z!i_xe07A+WQ z{$p|kJv3zAv}ca_=Tkej_cu)K_xi-zrJf_}8+`*y8b|+%lJ}P1o@C#4%Wt=3@``uRVP=rn6_a_tM`A-uuG5YZH5BP9y&wxYdz3{>;rcx?a51Yx?&hKiKmA zYgp^xxwgmW9(b8-Ie-03w_g*3p69KhI4rDiGeUdyg!g zx2fN=_q$!YHxwe3*}t&gjF`pd#iw7G`fzE-`PreL=Esv`cV=DNvhT*>6T{cz&isRg ib=SVF-mLu95dZL>he}_gJnPYa>RQ#)`Q^$D`~Cw5z%Lm9 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|Cq-|k;tzFs^1KD+U9``}>jWb^2JXX)V6&F9Z|-!EoRpKffP9vs}w@4Q=GJ6zw{ zIeB(DgLMAl)A9Mu&DO!%*754m#l`OV+TO{@&C{m`XJuNfFi zg8YIR9G=}s196hP-CZ0z@8$RbIh+L^k;M!Qd`Cc-ajG_-G*FPe#M9T6{V@}(peeVd z?55>FJ&QeE978nD_fC2nw%9({cSI#cSEqB*_uMf56JoW0L z{JszGEzh4Z@Db>-xpcZb$4%(e4asgb z#pgf%X!UNM82h~COuoQ#d&A^8u?yFDbcd^XHB3p{^GHvEx##{bJ+B2P|AaqPJp9Ax zbif?Gq}cneN^HtMKBnD5QC>S`HTAoc-tNlV#k0k9cbJE!TLrT~#3UOwwgs8) zTUT1VwL0ISoo%vZ>g~79i$fnP_$oY+Vl&!SA9QH7ae$=&J7*=^?(%_(xONRryKJKg_)~@eneL?1_jv9M@c`e~O0i$w{djk% zOn+}@oy7#6#pvG62@#|F)fx*unD)Mh8j*NaAdb}KpDjyat#$usd7k#inmd;m|_mO z;AIxLKnEo@t}Z93>veBOJX_si$= z!+Uu>8#>+1GoGCR0BG)5yK1A}=ju6U`ZT?^FMtUE9-rK>-n&{K|0m3LyB$TH1c6hO zhhgYYh~;@c9#5vzimDb$rCPm?IsuLW($hrKreM$(jyQ!V7Eh3=v_F##<+W(JA`uRQ z4{KsQX3l3586+7(2YDhJ_vO=UDJN7*QlqB2t-$X9VH}8*A;lW9QDZS>s^_h+>V$Pa zoDv~a?EsJf_zecuXymL`5kVvj8zjkGAW-DE(PR>4vsTn($IVXChWQaU>+o?XBVwTh z!ONalhLZArr4+EatWLKbqZ}T_MY9AekV4X*R9Hph)KW~Vrpk@15eFs;m;=BT0f=aD zCC%!TNjS@e)sb2d%M8c+jBQxUwLDvW#DAbn@0rI*N1Lu{-Vn~@Y2xufi-;h zS#{vUOUL(Q(#x zor!<;H;)Xzr&=r%KYY41J^JsJz+e5pSs1eD?)B#47i~+}zD>UR8>m>g>wb5B>+aQZn}d literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 1f0a72d449..6a77ebd8b8 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -419,19 +419,16 @@ "path": "icons/map_east_pressed.png" }, { - "path": "icons/multiplayer_toolbar.png", - "x_offset": 0, - "y_offset": 0 + "path": "icons/multiplayer_toolbar.png" }, { - "path": "icons/multiplayer_sync.png", - "x_offset": 0, - "y_offset": 0 + "path": "icons/multiplayer_toolbar_pressed.png" }, { - "path": "icons/multiplayer_desync.png", - "x_offset": 0, - "y_offset": 0 + "path": "icons/multiplayer_sync.png" + }, + { + "path": "icons/multiplayer_desync.png" }, { "path": "font/latin/ae-uc-small.png", diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index ae3607868e..23d0ebf860 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -251,7 +251,7 @@ static rct_widget window_top_toolbar_widgets[] = { { WWT_TRNBTN, 3, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP },// Finances { WWT_TRNBTN, 3, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP }, // Research { WWT_TRNBTN, 3, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP }, // News - { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_SHOW_MULTIPLAYER_STATUS_TIP }, // Network + { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP }, // Network { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP }, // Chat { WWT_EMPTY, 0, 0, 10-1, 0, 0, 0xFFFFFFFF, STR_NONE }, // Artificial widget separator @@ -996,13 +996,14 @@ 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_G2_MULTIPLAYER_TOOLBAR; - gfx_draw_sprite(dpi, imgId, x - 2, y - 2, 0); - gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; + + // Draw (de)sync icon. imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC); gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0); + // Draw number of players. int32_t player_count = network_get_num_players(); + gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gfx_draw_string_right(dpi, STR_COMMA16, &player_count, COLOUR_WHITE | COLOUR_FLAG_OUTLINE, x + 23, y + 1); } } diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index ff09958c04..ee35b4c50c 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -838,11 +838,12 @@ enum SPR_G2_MAP_EAST = SPR_G2_BEGIN + 120, SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 121, - 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_TOOLBAR_MULTIPLAYER = SPR_G2_BEGIN + 122, + SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED = SPR_G2_BEGIN + 123, + SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 124, + SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 125, - SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 125, + SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 126, SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN, SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,