From 858be90222d25a625c06dfaad1c8f4aede109ab9 Mon Sep 17 00:00:00 2001 From: hexdec Date: Sun, 31 Aug 2014 00:06:11 +0200 Subject: [PATCH 1/2] Added the missing enabled_widgets for window_staff_peep. --- src/window_staff_peep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/window_staff_peep.c b/src/window_staff_peep.c index 1195812b4b..19a5d8076d 100644 --- a/src/window_staff_peep.c +++ b/src/window_staff_peep.c @@ -213,7 +213,12 @@ uint32 window_staff_peep_page_enabled_widgets[] = { (1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | - (1 << WIDX_TAB_3), + (1 << WIDX_TAB_3) | + (1 << WIDX_VIEWPORT) | // Sweep footpaths & Inspect rides + (1 << WIDX_BTM_LABEL) | // Water gardens & Fix rides + (1 << WIDX_PICKUP) | // Empty litter bins + (1 << WIDX_PATROL) | // Mow grass + (1 << WIDX_LOCATE), // Entertainer costume dropdown (1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | @@ -620,7 +625,6 @@ void window_staff_peep_orders_mouseup() case WIDX_BTM_LABEL: case WIDX_PICKUP: case WIDX_PATROL: - case WIDX_RENAME: window_staff_peep_set_order(w, widgetIndex - 8); break; } From d2e27c042809a1475dc3367ae98790ca0bcb8f38 Mon Sep 17 00:00:00 2001 From: hexdec Date: Sun, 31 Aug 2014 00:16:35 +0200 Subject: [PATCH 2/2] Added Widget enums for window_staff_peep. --- src/window_staff_peep.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/window_staff_peep.c b/src/window_staff_peep.c index 19a5d8076d..555818c920 100644 --- a/src/window_staff_peep.c +++ b/src/window_staff_peep.c @@ -50,7 +50,14 @@ enum WINDOW_STAFF_PEEP_WIDGET_IDX { WIDX_PATROL, WIDX_RENAME, WIDX_LOCATE, - WIDX_FIRE + WIDX_FIRE, + + WIDX_CHECKBOX_1 = 0x8, + WIDX_CHECKBOX_2, + WIDX_CHECKBOX_3, + WIDX_CHECKBOX_4, + + WIDX_COSTUME = 0xD, }; void window_staff_peep_emptysub(){}; @@ -214,11 +221,11 @@ uint32 window_staff_peep_page_enabled_widgets[] = { (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_TAB_3) | - (1 << WIDX_VIEWPORT) | // Sweep footpaths & Inspect rides - (1 << WIDX_BTM_LABEL) | // Water gardens & Fix rides - (1 << WIDX_PICKUP) | // Empty litter bins - (1 << WIDX_PATROL) | // Mow grass - (1 << WIDX_LOCATE), // Entertainer costume dropdown + (1 << WIDX_CHECKBOX_1) | + (1 << WIDX_CHECKBOX_2) | + (1 << WIDX_CHECKBOX_3) | + (1 << WIDX_CHECKBOX_4) | + (1 << WIDX_COSTUME), (1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | @@ -621,11 +628,11 @@ void window_staff_peep_orders_mouseup() case WIDX_TAB_3: window_staff_peep_set_page(w, widgetIndex - WIDX_TAB_1); break; - case WIDX_VIEWPORT: - case WIDX_BTM_LABEL: - case WIDX_PICKUP: - case WIDX_PATROL: - window_staff_peep_set_order(w, widgetIndex - 8); + case WIDX_CHECKBOX_1: + case WIDX_CHECKBOX_2: + case WIDX_CHECKBOX_3: + case WIDX_CHECKBOX_4: + window_staff_peep_set_order(w, widgetIndex - WIDX_CHECKBOX_1); break; } }