mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1981 from duncanspumpkin/fix_bugs 

Fix bugs
This commit is contained in:
Duncan 2015-09-27 17:52:19 +01:00
parent 4643881389 a697606211
commit 286bf3eb4c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cursors.h
View File

@ -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_data[32 * 4];
extern unsigned char hand_open_cursor_mask[32 * 4]; extern unsigned char hand_open_cursor_mask[32 * 4];
#define HAND_OPEN_CURSOR_HOTX 0 #define HAND_OPEN_CURSOR_HOTX 5
#define HAND_OPEN_CURSOR_HOTY 0 #define HAND_OPEN_CURSOR_HOTY 1
extern unsigned char hand_closed_cursor_data[32 * 4]; extern unsigned char hand_closed_cursor_data[32 * 4];
extern unsigned char hand_closed_cursor_mask[32 * 4]; extern unsigned char hand_closed_cursor_mask[32 * 4];
#define HAND_CLOSED_CURSOR_HOTX 0 #define HAND_CLOSED_CURSOR_HOTX 5
#define HAND_CLOSED_CURSOR_HOTY 0 #define HAND_CLOSED_CURSOR_HOTY 1
#endif #endif

2
src/input.c
View File

@ -1023,7 +1023,7 @@ void process_mouse_over(int x, int y)
RCT2_GLOBAL(0x9DE558, uint16) = x; RCT2_GLOBAL(0x9DE558, uint16) = x;
RCT2_GLOBAL(0x9DE55A, uint16) = y; RCT2_GLOBAL(0x9DE55A, uint16) = y;
int output_scroll_area, scroll_id; 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; cursorId = scroll_id;
if (output_scroll_area != SCROLL_PART_VIEW) if (output_scroll_area != SCROLL_PART_VIEW)
{ {

1
src/peep/peep.c
View File

@ -2643,6 +2643,7 @@ static void peep_udpate_ride_sub_state_13(rct_peep* peep){
peep->destination_x = x; peep->destination_x = x;
peep->destination_y = y; peep->destination_y = y;
return;
} }
peep->var_37 |= 3; peep->var_37 |= 3;