mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 17:24:47 +01:00
Code Issues Releases Wiki Activity

Added update_picked and update_entering_park. Added new entries to peep struct

Browse Source
This commit is contained in:
Duncan Frost
2014-10-18 09:11:35 +01:00
parent 97d47c3039
commit 481fd08ab5
4 changed files with 91 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows/guest.c
View File

@@ -626,7 +626,7 @@ void window_guest_overview_mouse_up(){
sub_69E9D3(0x8000, peep->y, peep->z, (rct_sprite*)peep);
peep_decrement_num_riders(peep);
peep->state = 9;
peep->state = PEEP_STATE_PICKED;
peep->var_2C = 0;
peep_window_state_update(peep);
break;

24
src/windows/staff.c
View File

@@ -1049,18 +1049,24 @@ void window_staff_stats_paint(){
switch (peep->staff_type){
case STAFF_TYPE_HANDYMAN:
gfx_draw_string_left(dpi, 2351, (void*)&peep->paid_to_enter, 0, x, y);
// Lawns mown
gfx_draw_string_left(dpi, 2351, (void*)&peep->staff_lawns_mown, 0, x, y);
y += 10;
gfx_draw_string_left(dpi, 2352, (void*)&peep->paid_on_rides, 0, x, y);
// Gardens Watered
gfx_draw_string_left(dpi, 2352, (void*)&peep->staff_gardens_watered, 0, x, y);
y += 10;
gfx_draw_string_left(dpi, 2353, (void*)&peep->paid_on_food, 0, x, y);
// Litter Swept
gfx_draw_string_left(dpi, 2353, (void*)&peep->staff_litter_swept, 0, x, y);
y += 10;
gfx_draw_string_left(dpi, 2354, (void*)&peep->paid_on_souvenirs, 0, x, y);
// Bins Emptied
gfx_draw_string_left(dpi, 2354, (void*)&peep->staff_bins_emptied, 0, x, y);
break;
case STAFF_TYPE_MECHANIC:
gfx_draw_string_left(dpi, 2356, (void*)&peep->paid_on_rides, 0, x, y);
// Rides Inspected
gfx_draw_string_left(dpi, 2356, (void*)&peep->staff_rides_inspected, 0, x, y);
y += 10;
gfx_draw_string_left(dpi, 2355, (void*)&peep->paid_to_enter, 0, x, y);
// Rides Fixed
gfx_draw_string_left(dpi, 2355, (void*)&peep->staff_rides_fixed, 0, x, y);
break;
}
}
@@ -1143,11 +1149,11 @@ void window_staff_overview_tool_down(){
}
rct_peep* peep = GET_PEEP(w->number);
RCT2_CALLPROC_X(0x0069E9D3, dest_x, 0, dest_y, dest_z, (int)peep, 0, 0);
sub_69E9D3(dest_x, dest_y, dest_z, (rct_sprite*)peep);
RCT2_CALLPROC_X(0x006EC473, 0, 0, 0, 0, (int)peep, 0, 0);
RCT2_CALLPROC_X(0x0069A409, 0, 0, 0, 0, (int)peep, 0, 0);
peep_decrement_num_riders(peep);
peep->state = 0;
RCT2_CALLPROC_X(0x0069A42F, 0, 0, 0, 0, (int)peep, 0, 0);
peep_window_state_update(peep);
peep->var_71 = 0xFF;
peep->var_6D = 0;
peep->var_70 = 0;