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

replace FOR_ALL_PEEPS with FOR_ALL_STAFF

This commit is contained in:
Hielke Morsink 2016-01-07 23:34:16 +01:00
parent 635fae15da
commit f9dc3f3454
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/windows/staff_list.c
View File

@ -308,13 +308,11 @@ void window_staff_list_update(rct_window *w)
} else { } else {
widget_invalidate(w, WIDX_STAFF_LIST_HANDYMEN_TAB + RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8)); widget_invalidate(w, WIDX_STAFF_LIST_HANDYMEN_TAB + RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8));
RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS, uint16) |= (1 << 2); RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS, uint16) |= (1 << 2);
FOR_ALL_PEEPS(spriteIndex, peep) { FOR_ALL_STAFF(spriteIndex, peep) {
if (peep->type == PEEP_TYPE_STAFF) { peep->list_flags &= ~(PEEP_LIST_FLAGS_FLASHING);
peep->list_flags &= ~(PEEP_LIST_FLAGS_FLASHING);
if (peep->staff_type == RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8)) { if (peep->staff_type == RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8)) {
peep->list_flags |= PEEP_LIST_FLAGS_FLASHING; peep->list_flags |= PEEP_LIST_FLAGS_FLASHING;
}
} }
} }
} }
@ -401,8 +399,8 @@ void window_staff_list_scrollgetsize(rct_window *w, int scrollIndex, int *width,
rct_peep *peep; rct_peep *peep;
uint16 staffCount = 0; uint16 staffCount = 0;
FOR_ALL_PEEPS(spriteIndex, peep) { FOR_ALL_STAFF(spriteIndex, peep) {
if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8)) if (peep->staff_type == RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8))
staffCount++; staffCount++;
} }
@ -435,10 +433,7 @@ void window_staff_list_scrollmousedown(rct_window *w, int scrollIndex, int x, in
rct_peep *peep; rct_peep *peep;
i = y / 10; i = y / 10;
FOR_ALL_PEEPS(spriteIndex, peep) { FOR_ALL_STAFF(spriteIndex, peep) {
if (peep->type != PEEP_TYPE_STAFF)
continue;
if (peep->staff_type != RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8)) if (peep->staff_type != RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8))
continue; continue;
@ -626,8 +621,8 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
y = 0; y = 0;
i = 0; i = 0;
selectedTab = RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8); selectedTab = RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8);
FOR_ALL_PEEPS(spriteIndex, peep) { FOR_ALL_STAFF(spriteIndex, peep) {
if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == selectedTab) { if (peep->staff_type == selectedTab) {
if (y > dpi->y + dpi->height) { if (y > dpi->y + dpi->height) {
break; break;
} }