From 8c4de402391225c3807804ee36d448754245f706 Mon Sep 17 00:00:00 2001
From: Xkeeper <xkeeper@gmail.com>
Date: Tue, 5 Feb 2019 01:43:27 -0800
Subject: [PATCH] Add graphics for desync notice

---
 resources/g2/icons/multiplayer_desync.png | Bin 0 -> 264 bytes
 resources/g2/icons/multiplayer_sync.png   | Bin 0 -> 267 bytes
 resources/g2/sprites.json                 |  10 ++++++++++
 src/openrct2-ui/windows/TopToolbar.cpp    |   7 ++++---
 src/openrct2/sprites.h                    |   5 ++++-
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 resources/g2/icons/multiplayer_desync.png
 create mode 100644 resources/g2/icons/multiplayer_sync.png

diff --git a/resources/g2/icons/multiplayer_desync.png b/resources/g2/icons/multiplayer_desync.png
new file mode 100644
index 0000000000000000000000000000000000000000..899cfde22699474e7330cffaff887efde0dfbf48
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^VnEEt!3-p2-pl+4QpN#3A+8M!4gZ1Q@`}5Y{WpL4
zsGOGj|FPTN9F=(s?Ek;Kq~AGtPP6URpWpxg-~IfKL~?}e|Njgp+P`oBwKJ9k`2{mL
zJiCzw<Zu>vL>2?hKLWyxQ?>b|fr5FSE{-7;ajB=m`HmQHxCXAuKJ})4>*oRy^@;D<
z7bt6FC5!#KcEh<|{iVBk{@H`4euX7J3wXM!zwf}At^4ktSx~C-^xN4x2bB(8sNL0?
zcH~0IobAFA*4}#6?B~}B&-ztU&$RqO=<ipmvKK$q#a)!Qmt<{!@VR#u&}IftS3j3^
HP6<r_i?VVc

literal 0
HcmV?d00001

diff --git a/resources/g2/icons/multiplayer_sync.png b/resources/g2/icons/multiplayer_sync.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb78f2bc4e8c44895ba29c5b20985b87f2a58fa4
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^VnEEt!3-p2-pl+4Qf2`@A+8M!4R<H||NsAgZ;s0U
z%PTg2`53pgs_109a$2r)d5C`J<o_=(*`;{3-tD^j^Lym{g5cKVb<Z{!{B0@$n!s2R
z<QL4~@a#q!ki%Kv5m^kh;s^*cPSxg<1`6hRx;TbZ#O0m}7douK;~MytX-CTc*}aKx
zj=cS6b5_!E{ekG#r2QWj6;Bb`sQEB*>NXL<m5<`xyPQH^-z?=`+SkHA-;`;oyEFfF
zh6i$->Ceu8PkngwuGo&FFXx|Jd)KzMDz$jK`r)iJZJX@1|LYh7?=f$zEWDlsw3)%v
L)z4*}Q$iB}y0>nM

literal 0
HcmV?d00001

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index 81eabe7675..7f3bac5eb7 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -418,6 +418,16 @@
     {
         "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",
         "y_offset": 0,
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index 0bddbc5f78..349180f178 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -999,10 +999,11 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
         imgId = SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION;
         gfx_draw_sprite(dpi, imgId, x, y, 0);
         gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
-        if (network_is_desynchronised())
-            gfx_draw_string(dpi, "</>", COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE, x - 1, y + 2);
+        imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC);
+        gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0);
+
         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);
     }
 }
 
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index 8f31e5f2e1..869a5ca1f5 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -838,7 +838,10 @@ enum
     SPR_G2_MAP_EAST = SPR_G2_BEGIN + 120,
     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_LOWER = SPR_G2_CHAR_BEGIN + 1,