From 451f4cce2636dee4a00801d88daa99e3be91761c Mon Sep 17 00:00:00 2001 From: Duncan Date: Wed, 25 Jun 2014 12:53:05 +0100 Subject: [PATCH] Input first two fields to widget array Consider splitting up into separate pages once the widgets are properly decompiled. See park_window. --- src/window_peep.c | 169 +++++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 86 deletions(-) diff --git a/src/window_peep.c b/src/window_peep.c index d7e288ead9..2a0d319ab2 100644 --- a/src/window_peep.c +++ b/src/window_peep.c @@ -30,91 +30,88 @@ void window_peep_emptysub(){}; -static rct_widget window_peep_widgets[] = { //Only left right done so far - { 1, 0, 0, 191, 0, 156, 0x0FFFFFFFF, STR_NONE }, // panel / background - { 20, 0, 1, 190, 1, 14, 865, 829}, // title bar - { 21, 0, 179, 189, 2, 13, 824, 828}, // close x button - { WWT_RESIZE, 1, 0, 191, 43, 156, 0x0FFFFFFFF, STR_NONE }, // tab content panel - { WWT_DROPDOWN, 1, 3, 33, 17, 70, STR_PAGE_1, STR_NONE }, // page dropdown - { WWT_DROPDOWN_BUTTON, 34, 73, 64, 17, 69, 876, STR_NONE }, // page dropdown button - { WWT_DROPDOWN, 1, 65, 95, 17, 70, 0x0FFFFFFFF, STR_INFORMATION_TYPE_TIP }, // information type dropdown - { WWT_DROPDOWN_BUTTON, 1, 96, 126, 17, 69, 876, STR_INFORMATION_TYPE_TIP }, // information type dropdown button - { WWT_FLATBTN, 1, 127, 157, 17, 69, 5192, STR_SHOW_GUESTS_ON_MAP_TIP }, // map - { WWT_TAB, 1, 158, 188, 17, 43, 0x02000144E, STR_INDIVIDUAL_GUESTS_TIP }, // tab 1 - { WWT_TAB, 1, 3, 166, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 3, 166, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 3, 166, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 167, 190, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 167, 190, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 167, 190, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 167, 190, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 0, 1, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, -1, 20, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 829, 21, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 828, 258, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, -1, 264, 72, 326, 3, STR_NONE }, { WWT_TAB, 1, 3, 64, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 1938, 264, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 1940, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 1941, 264, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 1943, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 1944, 26, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, -1, -1, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 865, 0, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 824, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, -1, -1, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 5198, 8192, 72, 326, 3, STR_NONE }, - { WWT_SCROLL, 1, 5198, 8192, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 5198, 8192, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 2, 0, 72, 326, 3, STR_NONE }, { WWT_TAB, 1, 3, 64, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 0, 156, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 1, 14, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 2, 13, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 43, 156, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 17, 43, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 17, 43, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 17, 43, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 17, 43, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 17, 43, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 17, 43, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 0, 191, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 1, 190, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 179, 189, 72, 326, 3, STR_NONE }, - { WWT_SCROLL, 1, 0, 191, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 3, 33, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 34, 64, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 65, 95, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 96, 126, 72, 326, 3, STR_NONE }, { WWT_TAB, 1, 3, 64, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 127, 157, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 158, 188, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 0, 1, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, -1, 20, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 829, 21, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 828, 258, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, -1, 264, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 1938, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 1940, 264, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 1941, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 1942, 264, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 1943, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 1944, 26, 72, 326, 3, STR_NONE }, - { WWT_SCROLL, 1, -1, -1, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 1463, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 824, 0, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, -1, -1, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 3440, 0, 72, 326, 3, STR_NONE }, { WWT_TAB, 1, 3, 64, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 876, 0, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, -1, -1, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 3440, 0, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 876, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, -1, -1, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 876, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 5192, 0, 72, 326, 3, STR_NONE }, - { WWT_TAB, 1, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 - { WWT_SCROLL, 1, 5198, 8192, 72, 326, 3, STR_NONE }, // guest list - { WWT_TAB, 1, 3, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 +static rct_widget window_peep_widgets[] = { //Only first 4 fields done so far + { 1, 0, 0, 191, 0, 156, 0x0FFFFFFFF, STR_NONE }, // panel / background + { 20, 0, 1, 190, 1, 14, 865, 829}, // title bar + { 21, 0, 179, 189, 2, 13, 824, 828}, // close x button + { 2, 1, 1, 191, 43, 156, 0x0FFFFFFFF, STR_NONE }, // tab content panel + { 8, 1, 3, 33, 17, 70, STR_PAGE_1, STR_NONE }, // page dropdown + { 8, 1, 73, 64, 17, 69, 876, STR_NONE }, // page dropdown button + { 8, 1, 65, 95, 17, 70, 0x0FFFFFFFF, STR_INFORMATION_TYPE_TIP }, // information type dropdown + { 8, 1, 96, 126, 17, 69, 876, STR_INFORMATION_TYPE_TIP }, // information type dropdown button + { 8, 1, 127, 157, 17, 69, 5192, STR_SHOW_GUESTS_ON_MAP_TIP }, // map + { 8, 1, 158, 188, 17, 43, 0x02000144E, STR_INDIVIDUAL_GUESTS_TIP }, // tab 1 + { 12, 1, 3, 166, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 17, 1, 3, 166, 72, 326, 3, STR_NONE }, // guest list + { 12, 1, 3, 166, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 9, 1, 167, 190, 72, 326, 3, STR_NONE }, + { 9, 1, 167, 190, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 9, 1, 167, 190, 72, 326, 3, STR_NONE }, // guest list + { 9, 1, 167, 190, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 26, 0, 0, 1, 72, 326, 3, STR_NONE }, + { -1, -1, -1, 20, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 0, 829, 21, 72, 326, 3, STR_NONE }, // guest list + { 0, 0, 828, 258, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { -1, -1, -1, 264, 72, 326, 3, STR_NONE }, + { 0, 32, 1938, 264, 72, 326, 3, STR_NONE }, // guest list + { 0, 32, 1940, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 32, 1941, 264, 72, 326, 3, STR_NONE }, + { 0, 32, 1943, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 32, 1944, 26, 72, 326, 3, STR_NONE }, // guest list + { 0, 32, -1, -1, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 156, 0, 865, 0, 72, 326, 3, STR_NONE }, + { 13, 0, 824, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 14, 0, -1, -1, 72, 326, 3, STR_NONE }, // guest list + { 43, 0, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 43, 0, 5198, 8192, 72, 326, 3, STR_NONE }, + { 43, 0, 5198, 8192, 72, 326, 3, STR_NONE }, + { 43, 0, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 43, 0, 5198, 8192, 72, 326, 3, STR_NONE }, // guest list + { 43, 0, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 143, 0, 2, 0, 72, 326, 3, STR_NONE }, + { 191, 0, 0, 156, 72, 326, 3, STR_NONE }, // guest list + { 190, 0, 1, 14, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 189, 0, 2, 13, 72, 326, 3, STR_NONE }, + { 191, 0, 43, 156, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 33, 0, 17, 43, 72, 326, 3, STR_NONE }, // guest list + { 64, 0, 17, 43, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 95, 0, 17, 43, 72, 326, 3, STR_NONE }, + { 126, 0, 17, 43, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 157, 0, 17, 43, 72, 326, 3, STR_NONE }, // guest list + { 188, 0, 17, 43, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 1, 0, 0, 191, 72, 326, 3, STR_NONE }, + { 20, 0, 1, 190, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 21, 0, 179, 189, 72, 326, 3, STR_NONE }, + { 2, 1, 0, 191, 72, 326, 3, STR_NONE }, + { 8, 1, 3, 33, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 8, 1, 34, 64, 72, 326, 3, STR_NONE }, // guest list + { 8, 1, 65, 95, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 8, 1, 96, 126, 72, 326, 3, STR_NONE }, + { 8, 1, 127, 157, 72, 326, 3, STR_NONE }, // guest list + { 8, 1, 158, 188, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 26, 0, 0, 1, 72, 326, 3, STR_NONE }, + { -1, -1, -1, 20, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 0, 829, 21, 72, 326, 3, STR_NONE }, // guest list + { 0, 0, 828, 258, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { -1, -1, -1, 264, 72, 326, 3, STR_NONE }, + { 0, 32, 1938, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 32, 1940, 264, 72, 326, 3, STR_NONE }, // guest list + { 0, 32, 1941, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 32, 1942, 264, 72, 326, 3, STR_NONE }, + { 0, 32, 1943, 264, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 0, 32, 1944, 26, 72, 326, 3, STR_NONE }, + { 73, 1, -1, -1, 72, 326, 3, STR_NONE }, + { 14, 0, 1463, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 15, 0, 824, 0, 72, 326, 3, STR_NONE }, // guest list + { 73, 1, -1, -1, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 70, 0, 3440, 0, 72, 326, 3, STR_NONE }, + { 69, 0, 876, 0, 72, 326, 3, STR_NONE }, // guest list + { 70, 0, -1, -1, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 69, 0, 876, 0, 72, 326, 3, STR_NONE }, + { 69, 0, 5192, 0, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 43, 0, 5198, 8192, 72, 326, 3, STR_NONE }, // guest list + { 43, 0, 5198, 8192, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2 + { 70, 1, 3, 0, 72, 326, 3, STR_NONE }, { WIDGETS_END }, }; @@ -168,4 +165,4 @@ void window_peep_open(rct_peep* peep){ } RCT2_CALLPROC_X(0x006989E9, 0, 0, 0, (int)peep, 0, 0, 0); -} \ No newline at end of file +}