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

Ignore wide flags on patrol zone edges in path finding heuristic, fixes #5414 

Wide path flags in patrol zones can divide the paths with an uncrossable boundary. Ignore wide flags on the patrol zone edges to provide doorways for mechanics through these boundaries without otherwise affecting the path finding heuristic.

Fixes #5414.

Requires new network version.
This commit is contained in:
zaxcav 2017-05-02 08:10:09 +02:00 committed by Michael Steenbeek
parent 5e03fcde33
commit 0debd879da
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/network/network.h
View File

@ -56,7 +56,7 @@ extern "C" {
// This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "20"
#define NETWORK_STREAM_VERSION "21"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus

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

@ -9105,9 +9105,32 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep
z = mapElement->base_height;
if (footpath_element_is_wide(mapElement)) {
searchResult = PATH_SEARCH_WIDE;
found = true;
break;
if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == STAFF_TYPE_MECHANIC) {
// Check whether the tile is not on the
// edge of the mechanic patrol zone.
bool onZoneEdge = false;
int neighbourDir = 0;
while (!onZoneEdge && neighbourDir <= 3) {
int neighbourX = x + TileDirectionDelta[neighbourDir].x;
int neighbourY = y + TileDirectionDelta[neighbourDir].y;
onZoneEdge = !staff_is_location_in_patrol(peep, neighbourX, neighbourY);
neighbourDir++;
}
// Wide paths not on the edge of the
// mechanic patrol zone are observed.
if (!onZoneEdge) {
searchResult = PATH_SEARCH_WIDE;
found = true;
break;
}
// Wide path flag for path tiles on the
// edge of the mechanic patrol zone are
// ignored.
} else {
searchResult = PATH_SEARCH_WIDE;
found = true;
break;
}
}
searchResult = PATH_SEARCH_THIN;