mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Remove unused fourth tab from Staff window (#12713)

Browse Source
This commit is contained in:
Aaron van Geffen
2020-08-17 20:21:46 +02:00
committed by GitHub
parent 40814c46d9
commit 72be84caf8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2-ui/windows/Staff.cpp
View File

@@ -50,8 +50,8 @@ enum WINDOW_STAFF_WIDGET_IDX {
WIDX_TAB_1,
WIDX_TAB_2,
WIDX_TAB_3,
WIDX_TAB_4,
WIDX_VIEWPORT,
WIDX_VIEWPORT = 7,
WIDX_BTM_LABEL,
WIDX_PICKUP,
WIDX_PATROL,
@@ -59,7 +59,7 @@ enum WINDOW_STAFF_WIDGET_IDX {
WIDX_LOCATE,
WIDX_FIRE,
WIDX_CHECKBOX_1 = 8,
WIDX_CHECKBOX_1 = 7,
WIDX_CHECKBOX_2,
WIDX_CHECKBOX_3,
WIDX_CHECKBOX_4,
@@ -75,8 +75,7 @@ validate_global_widx(WC_STAFF, WIDX_PICKUP);
MakeWidget ({ 0, 43}, {190, 137}, WWT_RESIZE, 1 ), /* Resize */ \
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_OVERVIEW_TIP), /* Tab 1 */ \
MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_OPTIONS_TIP ), /* Tab 2 */ \
MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_STATS_TIP ), /* Tab 3 */ \
MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ) /* Tab 4 */
MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_STATS_TIP ) /* Tab 3 */
static rct_widget window_staff_overview_widgets[] = {
MAIN_STAFF_WIDGETS,
@@ -358,7 +357,7 @@ void window_staff_disable_widgets(rct_window* w)
{
return;
}
uint64_t disabled_widgets = (1 << WIDX_TAB_4);
uint64_t disabled_widgets = 0;
if (peep != nullptr && peep->StaffType == STAFF_TYPE_SECURITY)
{

4
src/openrct2/interface/Window.h
View File

@@ -542,14 +542,14 @@ enum
#define WC_SCENERY__WIDX_SCENERY_TAB_1 4
#define WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON 25
#define WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON 30
#define WC_PEEP__WIDX_PATROL 11
#define WC_PEEP__WIDX_PATROL 10
#define WC_PEEP__WIDX_ACTION_LBL 13
#define WC_PEEP__WIDX_PICKUP 14
#define WC_TRACK_DESIGN_LIST__WIDX_ROTATE 8
#define WC_TRACK_DESIGN_PLACE__WIDX_ROTATE 3
#define WC_MAP__WIDX_ROTATE_90 20
#define WC_EDITOR_OBJECT_SELECTION__WIDX_TAB_1 21
#define WC_STAFF__WIDX_PICKUP 10
#define WC_STAFF__WIDX_PICKUP 9
#define WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE 14
#define WC_TILE_INSPECTOR__WIDX_BUTTON_CORRUPT 10
#define WC_TILE_INSPECTOR__WIDX_BUTTON_COPY 17