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

Fix more small pathfinding bugs. Fix unset memory errors

This commit is contained in:
Duncan Frost 2015-07-25 10:12:51 +01:00
parent 074b2a6909
commit bff00b29bf
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/peep/peep.c
View File

@ -6129,7 +6129,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m
peep->destination_y += RCT2_ADDRESS(0x00993CCE, sint16)[peep->var_78 * 2];
peep->destination_tolerence = 9;
invalidate_sprite((rct_sprite*)peep);
sprite_move(peep->destination_x, peep->destination_y, peep->z, (rct_sprite*)peep);
sprite_move(x, y, peep->z, (rct_sprite*)peep);
invalidate_sprite((rct_sprite*)peep);
peep_decrement_num_riders(peep);
@ -6253,7 +6253,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m
peep->destination_tolerence = 7;
invalidate_sprite((rct_sprite*)peep);
sprite_move(peep->destination_x, peep->destination_y, peep->z, (rct_sprite*)peep);
sprite_move(x, y, peep->z, (rct_sprite*)peep);
invalidate_sprite((rct_sprite*)peep);
return 1;
@ -6265,7 +6265,7 @@ static int peep_footpath_move_forward(rct_peep* peep, sint16 x, sint16 y, rct_ma
peep->next_x = (x & 0xFFE0);
peep->next_y = (y & 0xFFE0);
peep->next_z = map_element->base_height;
peep->next_var_29 = map_element->properties.path.type & 3;
peep->next_var_29 = map_element->properties.path.type & 7;
sint16 z = peep_get_height_on_slope(peep, x, y);
@ -6280,7 +6280,7 @@ static int peep_footpath_move_forward(rct_peep* peep, sint16 x, sint16 y, rct_ma
peep->var_EF &= 0xC0;
peep->var_EF |= var_EF;
if (RCT2_GLOBAL(0x00F1AEE2, uint8) == 1){
if (vandalism == true){
peep->var_EF |= 1;
if (peep->var_EF & 0x3E &&
!(peep->var_EF & 0xC0)){
@ -6599,7 +6599,7 @@ static int sub_693C9E(rct_peep *peep)
}
if (x < 32 || y < 32 || x >= RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE_UNITS, uint16) || y >= RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE_UNITS, uint16)){
if (peep->type == PEEP_TYPE_STAFF){
if (peep->var_2A == 1){
RCT2_GLOBAL(0x00F1EE18, uint16) |= (1 << 1);
}
return peep_return_to_center_of_tile(peep);

2
src/windows/guest.c
View File

@ -688,7 +688,7 @@ void window_guest_viewport_init(rct_window* w){
union{
sprite_focus sprite;
coordinate_focus coordinate;
} focus; //The focus will be either a sprite or a coordinate.
} focus = { 0 }; //The focus will be either a sprite or a coordinate.
focus.sprite.sprite_id = w->number;

2
src/windows/staff.c
View File

@ -1177,7 +1177,7 @@ void window_staff_overview_unknown_14(rct_window *w)
void window_staff_viewport_init(rct_window* w){
if (w->page != WINDOW_STAFF_OVERVIEW) return;
sprite_focus focus;
sprite_focus focus = { 0 };
focus.sprite_id = w->number;

2
src/world/footpath.c
View File

@ -518,7 +518,7 @@ void footpath_provisional_update()
*/
void footpath_get_coordinates_from_pos(int screenX, int screenY, int *x, int *y, int *direction, rct_map_element **mapElement)
{
int z, interactionType;
int z = 0, interactionType;
rct_map_element *myMapElement;
rct_viewport *viewport;
rct_xy16 map_pos = { 0 };