mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

Update sync icons, new multiplayer toolbar button

Browse Source 
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.
This commit is contained in:
Xkeeper
2019-02-05 10:10:52 -08:00
committed by Aaron van Geffen
parent 8c4de40239
commit c075eec224
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/g2/icons/multiplayer_desync.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 976 B

BIN
resources/g2/icons/multiplayer_sync.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 972 B

BIN
resources/g2/icons/multiplayer_toolbar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 910 B

5
resources/g2/sprites.json
View File

@@ -418,6 +418,11 @@
{ {
"path": "icons/map_east_pressed.png" "path": "icons/map_east_pressed.png"
}, },
{
"path": "icons/multiplayer_toolbar.png",
"x_offset": 0,
"y_offset": 0
},
{ {
"path": "icons/multiplayer_sync.png", "path": "icons/multiplayer_sync.png",
"x_offset": 0, "x_offset": 0,

4
src/openrct2-ui/windows/TopToolbar.cpp
View File

@@ -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; y = w->y + window_top_toolbar_widgets[WIDX_NETWORK].top + 0;
if (widget_is_pressed(w, WIDX_NETWORK)) if (widget_is_pressed(w, WIDX_NETWORK))
y++; y++;
imgId = SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION; imgId = SPR_G2_MULTIPLAYER_TOOLBAR;
gfx_draw_sprite(dpi, imgId, x, y, 0); gfx_draw_sprite(dpi, imgId, x - 2, y - 2, 0);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC); imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC);
gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0); gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0);

7
src/openrct2/sprites.h
View File

@@ -838,10 +838,11 @@ enum
SPR_G2_MAP_EAST = SPR_G2_BEGIN + 120, SPR_G2_MAP_EAST = SPR_G2_BEGIN + 120,
SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 121, SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 121,
SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 122, SPR_G2_MULTIPLAYER_TOOLBAR = SPR_G2_BEGIN + 122,
SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 123, 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_UPPER = SPR_G2_CHAR_BEGIN,
SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1, SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,