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

Fix map_get_path_element_at to not consider ghosts

Browse Source
This commit is contained in:
Michał Janiszewski
2017-01-23 23:07:12 +01:00
parent 88113ca952
commit ceb77b489d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/peep/peep.c
View File

@@ -5399,7 +5399,7 @@ static sint32 peep_update_walking_find_bench(rct_peep* peep){
rct_map_element* map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32);
for (;; map_element++){
if (!(map_element->flags & MAP_ELEMENT_FLAG_GHOST) && (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH)) {
if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) {
if (peep->next_z == map_element->base_height)break;
}
if (map_element_is_last_for_tile(map_element)){
@@ -10109,7 +10109,7 @@ static sint32 guest_path_finding(rct_peep* peep)
z = peep->next_z;
rct_map_element *mapElement = map_get_path_element_at(x / 32, y / 32, z);
if (mapElement == NULL || (mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) {
if (mapElement == NULL) {
return 1;
}
@@ -10420,7 +10420,7 @@ static sint32 sub_693C9E(rct_peep *peep)
continue;
if (top_z < mapElement->base_height)
continue;
if ((mapElement->flags & MAP_ELEMENT_FLAG_GHOST))
if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST)
continue;
if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH){

2
src/openrct2/world/map.c
View File

@@ -330,6 +330,8 @@ rct_map_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z){
// Find the path element at known z
do {
if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST)
continue;
if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH)
continue;
if (mapElement->base_height != z)