mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Add graphics for desync notice

Browse Source
This commit is contained in:
Xkeeper
2019-02-05 01:43:27 -08:00
committed by Aaron van Geffen
parent bc8ecd8e67
commit 8c4de40239
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 267 B

10
resources/g2/sprites.json
View File

@@ -418,6 +418,16 @@
{ {
"path": "icons/map_east_pressed.png" "path": "icons/map_east_pressed.png"
}, },
{
"path": "icons/multiplayer_sync.png",
"x_offset": 0,
"y_offset": 0
},
{
"path": "icons/multiplayer_desync.png",
"x_offset": 0,
"y_offset": 0
},
{ {
"path": "font/latin/ae-uc-small.png", "path": "font/latin/ae-uc-small.png",
"y_offset": 0, "y_offset": 0,

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

@@ -999,10 +999,11 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
imgId = SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION; imgId = SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION;
gfx_draw_sprite(dpi, imgId, x, y, 0); gfx_draw_sprite(dpi, imgId, x, y, 0);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
if (network_is_desynchronised()) imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC);
gfx_draw_string(dpi, "</>", COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE, x - 1, y + 2); gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0);
int32_t player_count = network_get_num_players(); int32_t player_count = network_get_num_players();
gfx_draw_string_right(dpi, STR_COMMA16, &player_count, COLOUR_WHITE | COLOUR_FLAG_OUTLINE, x + 24, y + 15); gfx_draw_string_right(dpi, STR_COMMA16, &player_count, COLOUR_WHITE | COLOUR_FLAG_OUTLINE, x + 23, y + 1);
} }
} }

5
src/openrct2/sprites.h
View File

@@ -838,7 +838,10 @@ 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_CHAR_BEGIN = SPR_G2_BEGIN + 122, SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 122,
SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 123,
SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 124,
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,