From e60a92ecd8bb7319d01f8dfb81026aa7e2e19df7 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Thu, 2 Feb 2017 22:21:49 +0100 Subject: [PATCH] Add disabled tab sprite. --- resources/g2/80.png | Bin 0 -> 113 bytes src/openrct2/sprites.h | 1 + src/openrct2/windows/options.c | 8 +++++++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 resources/g2/80.png diff --git a/resources/g2/80.png b/resources/g2/80.png new file mode 100644 index 0000000000000000000000000000000000000000..6422f149eeb40236eb7d3e24856f9eda3c42be3f GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^@<1%b$P6S)*NUD5QfvV}A+A7r`{BdwXWZ@rS&St? ze!&b5&u*jvIg*|(jv*C{$s7Lv|Igmc%*@Q~3?wcy2rw+m;$NlfkpeQD!PC{xWt~$( F69AHZ90ULW literal 0 HcmV?d00001 diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index e3b0142de6..14277e2573 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -751,6 +751,7 @@ enum { SPR_G2_SORT = SPR_G2_BEGIN + 77, SPR_G2_COPY = SPR_G2_BEGIN + 78, SPR_G2_PASTE = SPR_G2_BEGIN + 79, + SPR_G2_TAB_DISABLED = SPR_G2_BEGIN + 80, // 0x60000, chosen because it's a round hex number // of the last possible range of image ID values that is large enough to fit all csg1 sprites. diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index 3b1d7a7a36..2c2657626e 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -181,6 +181,12 @@ enum WINDOW_OPTIONS_WIDGET_IDX { #define WW 310 #define WH 332 +#ifndef DISABLE_TWITCH + #define TWITCH_TAB_SPRITE 0x20000000 | SPR_TAB +#else + #define TWITCH_TAB_SPRITE 0x20000000 | SPR_G2_TAB_DISABLED +#endif + #define MAIN_OPTIONS_WIDGETS \ { WWT_FRAME, 0, 0, WW-1, 0, WH-1, STR_NONE, STR_NONE }, \ { WWT_CAPTION, 0, 1, WW-2, 1, 14, STR_OPTIONS_TITLE, STR_WINDOW_TITLE_TIP }, \ @@ -192,7 +198,7 @@ enum WINDOW_OPTIONS_WIDGET_IDX { { WWT_TAB, 1, 96, 126, 17, 43, 0x20000000 | SPR_TAB, STR_OPTIONS_AUDIO_TIP }, \ { WWT_TAB, 1, 127, 157, 17, 43, 0x20000000 | SPR_TAB, STR_OPTIONS_CONTROLS_AND_INTERFACE_TIP }, \ { WWT_TAB, 1, 158, 188, 17, 43, 0x20000000 | SPR_TAB, STR_OPTIONS_MISCELLANEOUS_TIP }, \ - { WWT_TAB, 1, 189, 219, 17, 43, 0x20000000 | SPR_TAB, STR_OPTIONS_TWITCH_TIP } + { WWT_TAB, 1, 189, 219, 17, 43, TWITCH_TAB_SPRITE, STR_OPTIONS_TWITCH_TIP } static rct_widget window_options_display_widgets[] = { MAIN_OPTIONS_WIDGETS,