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

Added a very small bit of not drowning

This commit is contained in:
Duncan Frost 2014-09-18 17:36:32 +01:00
parent 606d8c5a25
commit 61e1645de0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/peep/peep.c
View File

@ -110,6 +110,7 @@ void peep_update_all()
*/
void peep_update_drowning(rct_peep* peep){
if (peep->var_71 == 11){
// Check to see if we are ready to drown.
RCT2_CALLPROC_X(0x6939EB, 0, 0, 0, 0, (int)peep, 0, 0);
if (peep->var_71 == 11) return;
if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & 0x80000)){
@ -135,7 +136,10 @@ void peep_update_drowning(rct_peep* peep){
RCT2_CALLPROC_X(0x69A535, 0, 0, 0, 0, (int)peep, 0, 0);
return;
}
RCT2_GLOBAL(0xF1AEC4, sint32) = -1;
rct_map_element *map_element = TILE_MAP_ELEMENT_POINTER((peep->y / 32) * 256 + (peep->x / 32));
if (map_element->type & 0x3C)
RCT2_CALLPROC_X(0x690028, 0, 0, 0, 0, (int)peep, 0, 0);
}