mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Merge pull request #570 from duncanspumpkin/peep_update

Browse Source 
Peep update
This commit is contained in:
Ted John
2014-11-18 13:26:53 +00:00
parent d821456709 e822894de9
commit af1cd86a35
8 changed files with 570 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/windows/guest.c
View File

@@ -1229,7 +1229,7 @@ void window_guest_overview_tool_down(){
peep_decrement_num_riders(peep);
peep->state = 0;
peep_window_state_update(peep);
peep->var_71 = 0xFF;
peep->action = 0xFF;
peep->var_6D = 0;
peep->var_70 = 0;
peep->var_6E = 0xFF;
@@ -1238,7 +1238,7 @@ void window_guest_overview_tool_down(){
peep->happiness_growth_rate -= 10;
if (peep->happiness_growth_rate < 0)peep->happiness_growth_rate = 0;
RCT2_CALLPROC_X(0x00693B58, 0, 0, 0, 0, (int)peep, 0, 0);
sub_693B58(peep);
tool_cancel();
RCT2_GLOBAL(0x9DE550, sint32) = -1;
}
@@ -1262,7 +1262,7 @@ void window_guest_overview_tool_abort(){
peep_decrement_num_riders(peep);
peep->state = 0;
peep_window_state_update(peep);
peep->var_71 = 0xFF;
peep->action = 0xFF;
peep->var_6D = 0;
peep->var_70 = 0;
peep->var_6E = 0;

4
src/windows/staff.c
View File

@@ -1154,7 +1154,7 @@ void window_staff_overview_tool_down(){
peep_decrement_num_riders(peep);
peep->state = PEEP_STATE_FALLING;
peep_window_state_update(peep);
peep->var_71 = 0xFF;
peep->action = 0xFF;
peep->var_6D = 0;
peep->var_70 = 0;
peep->var_6E = 0;
@@ -1192,7 +1192,7 @@ void window_staff_overview_tool_abort(){
peep_decrement_num_riders(peep);
peep->state = PEEP_STATE_FALLING;
peep_window_state_update(peep);
peep->var_71 = 0xFF;
peep->action = 0xFF;
peep->var_6D = 0;
peep->var_70 = 0;
peep->var_6E = 0;