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

Merge pull request #2905 from Overv/fix-guest-staff-disparity 

Fix staff lacking tile rectangle when picked up (fixes #2877)
This commit is contained in:
Ted John 2016-02-10 18:49:08 +00:00
parent 629bb93e3e 06304799b6
commit e3c20969ba
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/windows/guest.c
View File

@ -1207,13 +1207,11 @@ void window_guest_overview_tool_update(rct_window* w, int widgetIndex, int x, in
rct_peep* peep;
peep = GET_PEEP(w->number);
uint32 imageId = g_sprite_entries[peep->sprite_type].sprite_image[11].base_image;
imageId += w->picked_peep_frame >> 2;
int ebp = peep->tshirt_colour << 19;
int ecx = peep->trousers_colour << 24;
imageId |= ebp | ecx | 0xA0000000;
imageId |= (peep->tshirt_colour << 19) | (peep->trousers_colour << 24) | 0xA0000000;
RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_IMAGE, uint32) = imageId;
}

16
src/windows/staff.c
View File

@ -1096,6 +1096,22 @@ void window_staff_overview_tool_update(rct_window* w, int widgetIndex, int x, in
if (widgetIndex != WIDX_PICKUP)
return;
map_invalidate_selection_rect();
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~(1 << 0);
int map_x, map_y;
footpath_get_coordinates_from_pos(x, y + 16, &map_x, &map_y, NULL, NULL);
if (map_x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) |= 1;
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_TYPE, uint16) = 4;
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, sint16) = map_x;
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, sint16) = map_x;
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, sint16) = map_y;
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, sint16) = map_y;
map_invalidate_selection_rect();
}
RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_IMAGE, sint32) = -1;
int interactionType;