From 0f6611b6d6f80cb603532503ef4f953bcb9bc6a4 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Mon, 17 Aug 2020 20:52:50 +0200 Subject: [PATCH] Remove unused disabled tab sprite --- resources/g2/icons/tab_disabled.png | Bin 113 -> 0 bytes resources/g2/sprites.json | 3 - src/openrct2/sprites.h | 95 ++++++++++++++-------------- 3 files changed, 47 insertions(+), 51 deletions(-) delete mode 100644 resources/g2/icons/tab_disabled.png diff --git a/resources/g2/icons/tab_disabled.png b/resources/g2/icons/tab_disabled.png deleted file mode 100644 index 6422f149eeb40236eb7d3e24856f9eda3c42be3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 235d8fcd78..360d74dff9 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -236,9 +236,6 @@ { "path": "icons/paste.png" }, - { - "path": "icons/tab_disabled.png" - }, { "path": "track/intamin/booster_1.png" }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 7adcd3011a..6fd4fcd557 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -787,24 +787,23 @@ enum SPR_G2_SORT = SPR_G2_BEGIN + 76, SPR_G2_COPY = SPR_G2_BEGIN + 77, SPR_G2_PASTE = SPR_G2_BEGIN + 78, - SPR_G2_TAB_DISABLED = SPR_G2_BEGIN + 79, - SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 80, - SPR_G2_GIGA_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 81, - SPR_G2_BM_BOOSTER_NE_SW = SPR_G2_BEGIN + 82, - SPR_G2_BM_BOOSTER_NW_SE = SPR_G2_BEGIN + 83, + SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 79, + SPR_G2_GIGA_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 80, + SPR_G2_BM_BOOSTER_NE_SW = SPR_G2_BEGIN + 81, + SPR_G2_BM_BOOSTER_NW_SE = SPR_G2_BEGIN + 82, - SPR_G2_TOOLBAR_MUTE = SPR_G2_BEGIN + 86, - SPR_G2_TOOLBAR_MUTE_PRESSED = SPR_G2_BEGIN + 87, - SPR_G2_TOOLBAR_UNMUTE = SPR_G2_BEGIN + 88, - SPR_G2_TOOLBAR_UNMUTE_PRESSED = SPR_G2_BEGIN + 89, + SPR_G2_TOOLBAR_MUTE = SPR_G2_BEGIN + 85, + SPR_G2_TOOLBAR_MUTE_PRESSED = SPR_G2_BEGIN + 86, + SPR_G2_TOOLBAR_UNMUTE = SPR_G2_BEGIN + 87, + SPR_G2_TOOLBAR_UNMUTE_PRESSED = SPR_G2_BEGIN + 88, - SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 90, - SPR_G2_MINI_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 91, + SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 89, + SPR_G2_MINI_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 90, - SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3 = SPR_G2_BEGIN + 92, + SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3 = SPR_G2_BEGIN + 91, - SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_BEGIN + 93, + SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_BEGIN + 92, SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 0, SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 1, SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 2, @@ -817,53 +816,53 @@ enum SPR_G2_MINIATURE_RAILWAY_INSET_END_SW = SPR_G2_MINIATURE_RAILWAY_BEGIN + 9, SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 10, SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 11, - SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_BEGIN + 104, + SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_BEGIN + 103, - SPR_G2_SEARCH = SPR_G2_BEGIN + 105, + SPR_G2_SEARCH = SPR_G2_BEGIN + 104, - SPR_G2_SURFACE_GLASSY_RECOLOURABLE = SPR_G2_BEGIN + 106, + SPR_G2_SURFACE_GLASSY_RECOLOURABLE = SPR_G2_BEGIN + 105, - SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 107, - SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 108, - SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 109, - SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 110, + SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 106, + SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 107, + SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 108, + SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 109, - SPR_G2_EYEDROPPER = SPR_G2_BEGIN + 111, - SPR_G2_CHAT = SPR_G2_BEGIN + 112, + SPR_G2_EYEDROPPER = SPR_G2_BEGIN + 110, + SPR_G2_CHAT = SPR_G2_BEGIN + 111, - SPR_G2_MAP_NORTH = SPR_G2_BEGIN + 113, - SPR_G2_MAP_NORTH_PRESSED = SPR_G2_BEGIN + 114, - SPR_G2_MAP_WEST = SPR_G2_BEGIN + 115, - SPR_G2_MAP_WEST_PRESSED = SPR_G2_BEGIN + 116, - SPR_G2_MAP_SOUTH = SPR_G2_BEGIN + 117, - SPR_G2_MAP_SOUTH_PRESSED = SPR_G2_BEGIN + 118, - SPR_G2_MAP_EAST = SPR_G2_BEGIN + 119, - SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 120, + SPR_G2_MAP_NORTH = SPR_G2_BEGIN + 112, + SPR_G2_MAP_NORTH_PRESSED = SPR_G2_BEGIN + 113, + SPR_G2_MAP_WEST = SPR_G2_BEGIN + 114, + SPR_G2_MAP_WEST_PRESSED = SPR_G2_BEGIN + 115, + SPR_G2_MAP_SOUTH = SPR_G2_BEGIN + 116, + SPR_G2_MAP_SOUTH_PRESSED = SPR_G2_BEGIN + 117, + SPR_G2_MAP_EAST = SPR_G2_BEGIN + 118, + SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 119, - SPR_G2_TOOLBAR_MULTIPLAYER = SPR_G2_BEGIN + 121, - SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED = SPR_G2_BEGIN + 122, - SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 123, - SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 124, + SPR_G2_TOOLBAR_MULTIPLAYER = SPR_G2_BEGIN + 120, + SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED = SPR_G2_BEGIN + 121, + SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 122, + SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 123, - SPR_G2_SIMULATE = SPR_G2_BEGIN + 125, - SPR_G2_RCT1_SIMULATE_BUTTON_0 = SPR_G2_BEGIN + 126, - SPR_G2_RCT1_SIMULATE_BUTTON_1 = SPR_G2_BEGIN + 127, - SPR_G2_RCT1_SIMULATE_BUTTON_2 = SPR_G2_BEGIN + 128, - SPR_G2_RCT1_SIMULATE_BUTTON_3 = SPR_G2_BEGIN + 129, + SPR_G2_SIMULATE = SPR_G2_BEGIN + 124, + SPR_G2_RCT1_SIMULATE_BUTTON_0 = SPR_G2_BEGIN + 125, + SPR_G2_RCT1_SIMULATE_BUTTON_1 = SPR_G2_BEGIN + 126, + SPR_G2_RCT1_SIMULATE_BUTTON_2 = SPR_G2_BEGIN + 127, + SPR_G2_RCT1_SIMULATE_BUTTON_3 = SPR_G2_BEGIN + 128, - SPR_G2_LAND_TOOL_SIZE_6 = SPR_G2_BEGIN + 130, + SPR_G2_LAND_TOOL_SIZE_6 = SPR_G2_BEGIN + 129, - SPR_G2_MOUNTAIN_TOOL_EVEN = SPR_G2_BEGIN + 131, - SPR_G2_MOUNTAIN_TOOL_ODD = SPR_G2_BEGIN + 132, + SPR_G2_MOUNTAIN_TOOL_EVEN = SPR_G2_BEGIN + 130, + SPR_G2_MOUNTAIN_TOOL_ODD = SPR_G2_BEGIN + 131, - SPR_G2_SCENERY_SCATTER_LOW = SPR_G2_BEGIN + 133, - SPR_G2_SCENERY_SCATTER_MEDIUM = SPR_G2_BEGIN + 134, - SPR_G2_SCENERY_SCATTER_HIGH = SPR_G2_BEGIN + 135, + SPR_G2_SCENERY_SCATTER_LOW = SPR_G2_BEGIN + 132, + SPR_G2_SCENERY_SCATTER_MEDIUM = SPR_G2_BEGIN + 133, + SPR_G2_SCENERY_SCATTER_HIGH = SPR_G2_BEGIN + 134, - SPR_G2_WOODEN_RC_BOOSTER_SW_NE = SPR_G2_BEGIN + 136, - SPR_G2_WOODEN_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 137, + SPR_G2_WOODEN_RC_BOOSTER_SW_NE = SPR_G2_BEGIN + 135, + SPR_G2_WOODEN_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 136, - SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 138, + SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 137, SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN, SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,