diff --git a/data/g2.dat b/data/g2.dat index 551a8d2ef6..ce7d217b48 100644 Binary files a/data/g2.dat and b/data/g2.dat differ diff --git a/resources/g2/2.png b/resources/g2/2.png new file mode 100644 index 0000000000..674702e550 Binary files /dev/null and b/resources/g2/2.png differ diff --git a/resources/g2/3.png b/resources/g2/3.png new file mode 100644 index 0000000000..20432f67df Binary files /dev/null and b/resources/g2/3.png differ diff --git a/resources/g2/4.png b/resources/g2/4.png new file mode 100644 index 0000000000..29118138d8 Binary files /dev/null and b/resources/g2/4.png differ diff --git a/resources/g2/empty.png b/resources/g2/empty.png new file mode 100644 index 0000000000..205d3c50a4 Binary files /dev/null and b/resources/g2/empty.png differ diff --git a/src/sprites.h b/src/sprites.h index 5da29d9ff7..6b30a0f6fb 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -348,7 +348,10 @@ enum { SPR_G2_BEGIN = 324288, SPR_G2_LOGO = SPR_G2_BEGIN + 0, - SPR_G2_TITLE = SPR_G2_BEGIN + 1 + SPR_G2_TITLE = SPR_G2_BEGIN + 1, + SPR_G2_FASTFORWARD = SPR_G2_BEGIN + 2, + SPR_G2_SPEED_ARROW = SPR_G2_BEGIN + 3, + SPR_G2_HYPER_ARROWS = SPR_G2_BEGIN + 4 }; #endif diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index 1128961e02..7ad7199397 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -640,17 +640,16 @@ static void window_top_toolbar_paint() y = w->y + window_top_toolbar_widgets[WIDX_FASTFORWARD].top + 0; if (widget_is_pressed(w, WIDX_FASTFORWARD)) y++; - //imgId = 5229;//SPR_NEXT; - //gfx_draw_sprite(dpi, imgId, x - 1, y - 2, 0); - imgId = SPR_NEXT; - gfx_draw_sprite(dpi, imgId, x + 4, y, 0); + imgId = SPR_G2_FASTFORWARD; + gfx_draw_sprite(dpi, imgId, x + 6, y + 3, 0); - char speedStr[] = { FORMAT_MEDIUMFONT, FORMAT_OUTLINE, - (gGameSpeed >= 5 ? FORMAT_YELLOW : FORMAT_GREEN), - 175, (gGameSpeed >= 2 ? 175 : '\0'), (gGameSpeed >= 3 ? 175 : '\0'), (gGameSpeed >= 4 ? 175 : '\0'), '\0' - }; - format_string_raw(RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char), speedStr, NULL); - gfx_draw_string(dpi, speedStr, 0, x + 5, y + 14); + + for (int i = 0; i < gGameSpeed && gGameSpeed <= 4; i++) { + gfx_draw_sprite(dpi, SPR_G2_SPEED_ARROW, x + 5 + i * 5, y + 15, 0); + } + if (gGameSpeed == 8) { + gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROWS, x + 5, y + 15, 0); + } } // Draw cheats button