From 1a0fc465592f178be598975b0823f919b20b3307 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 27 Sep 2015 16:21:45 +0100 Subject: [PATCH 1/2] Fix #1723 issue caused by failing to return. The logic would fall through to the ending code so that it would just make a beeline to the exit after walking to one corner. --- src/peep/peep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/peep/peep.c b/src/peep/peep.c index 61d0f78203..2ac50005c0 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -2643,6 +2643,7 @@ static void peep_udpate_ride_sub_state_13(rct_peep* peep){ peep->destination_x = x; peep->destination_y = y; + return; } peep->var_37 |= 3; From a697606211bbc439c41f376fab8695d224aaa42a Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 27 Sep 2015 16:55:34 +0100 Subject: [PATCH 2/2] Fix #1718. Incorrect cursors on scroll widgets. Issue was being caused by passing the incorrect x and y parameters due to missing a widget dereference. I've also moved the x/y coordinates of the hand open/close to closer match what it feels like. --- src/cursors.h | 8 ++++---- src/input.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cursors.h b/src/cursors.h index 19b19a2448..b3714cfaa1 100644 --- a/src/cursors.h +++ b/src/cursors.h @@ -174,12 +174,12 @@ extern unsigned char entrance_down_cursor_mask[32 * 4]; extern unsigned char hand_open_cursor_data[32 * 4]; extern unsigned char hand_open_cursor_mask[32 * 4]; -#define HAND_OPEN_CURSOR_HOTX 0 -#define HAND_OPEN_CURSOR_HOTY 0 +#define HAND_OPEN_CURSOR_HOTX 5 +#define HAND_OPEN_CURSOR_HOTY 1 extern unsigned char hand_closed_cursor_data[32 * 4]; extern unsigned char hand_closed_cursor_mask[32 * 4]; -#define HAND_CLOSED_CURSOR_HOTX 0 -#define HAND_CLOSED_CURSOR_HOTY 0 +#define HAND_CLOSED_CURSOR_HOTX 5 +#define HAND_CLOSED_CURSOR_HOTY 1 #endif \ No newline at end of file diff --git a/src/input.c b/src/input.c index 8027c458a4..7a60d4f8a2 100644 --- a/src/input.c +++ b/src/input.c @@ -1023,7 +1023,7 @@ void process_mouse_over(int x, int y) RCT2_GLOBAL(0x9DE558, uint16) = x; RCT2_GLOBAL(0x9DE55A, uint16) = y; int output_scroll_area, scroll_id; - widget_scroll_get_part(window, window->widgets, x, y, &x, &y, &output_scroll_area, &scroll_id); + widget_scroll_get_part(window, &window->widgets[widgetId], x, y, &x, &y, &output_scroll_area, &scroll_id); cursorId = scroll_id; if (output_scroll_area != SCROLL_PART_VIEW) {