mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Make staff_is_location_on_patrol_edge use CoordsXY

Browse Source
This commit is contained in:
Tulio Leao
2020-06-21 16:41:18 -03:00
parent 1a7943a5ab
commit caeed92cf0
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/openrct2/peep/Staff.cpp
View File

@@ -187,7 +187,7 @@ bool Staff::IsLocationInPatrol(const CoordsXY& loc) const
return IsPatrolAreaSet(loc);
}
bool staff_is_location_on_patrol_edge(Peep* mechanic, int32_t x, int32_t y)
bool staff_is_location_on_patrol_edge(Peep* mechanic, const CoordsXY& loc)
{
// Check whether the location x,y is inside and on the edge of the
// patrol zone for mechanic.
@@ -195,9 +195,8 @@ bool staff_is_location_on_patrol_edge(Peep* mechanic, int32_t x, int32_t y)
int32_t neighbourDir = 0;
while (!onZoneEdge && neighbourDir <= 7)
{
int32_t neighbourX = x + CoordsDirectionDelta[neighbourDir].x;
int32_t neighbourY = y + CoordsDirectionDelta[neighbourDir].y;
onZoneEdge = !mechanic->AsStaff()->IsLocationInPatrol({ neighbourX, neighbourY });
auto neighbourPos = loc + CoordsDirectionDelta[neighbourDir];
onZoneEdge = !mechanic->AsStaff()->IsLocationInPatrol(neighbourPos);
neighbourDir++;
}
return onZoneEdge;
@@ -229,7 +228,7 @@ bool staff_can_ignore_wide_flag(Peep* staff, int32_t x, int32_t y, uint8_t z, Ti
if (staff->AssignedPeepType != PEEP_TYPE_STAFF)
return false;
if (!staff_is_location_on_patrol_edge(staff, x, y))
if (!staff_is_location_on_patrol_edge(staff, { x, y }))
{
return false;
}
@@ -241,16 +240,14 @@ bool staff_can_ignore_wide_flag(Peep* staff, int32_t x, int32_t y, uint8_t z, Ti
uint8_t widecount = 0;
for (Direction adjac_dir : ALL_DIRECTIONS)
{
int32_t adjac_x = x + CoordsDirectionDelta[adjac_dir].x;
int32_t adjac_y = y + CoordsDirectionDelta[adjac_dir].y;
uint8_t adjac_z = z;
auto adjacPos = CoordsXYZ{ x + CoordsDirectionDelta[adjac_dir].x, y + CoordsDirectionDelta[adjac_dir].y, z };
/* Ignore adjacent tiles outside the patrol zone. */
if (!staff->AsStaff()->IsLocationInPatrol({ adjac_x, adjac_y }))
if (!staff->AsStaff()->IsLocationInPatrol(adjacPos))
continue;
/* Ignore adjacent tiles on the patrol zone edge. */
if (staff_is_location_on_patrol_edge(staff, adjac_x, adjac_y))
if (staff_is_location_on_patrol_edge(staff, adjacPos))
continue;
/* Adjacent tile is inside the patrol zone but not on the
@@ -267,12 +264,12 @@ bool staff_can_ignore_wide_flag(Peep* staff, int32_t x, int32_t y, uint8_t z, Ti
{
if (path->AsPath()->GetSlopeDirection() == adjac_dir)
{
adjac_z = z + 2;
adjacPos.z = z + 2;
}
}
/* Search through all adjacent map elements */
TileElement* test_element = map_get_first_element_at({ adjac_x, adjac_y });
TileElement* test_element = map_get_first_element_at(adjacPos);
if (test_element == nullptr)
return false;
bool pathfound = false;
@@ -285,7 +282,7 @@ bool staff_can_ignore_wide_flag(Peep* staff, int32_t x, int32_t y, uint8_t z, Ti
}
/* test_element is a path */
if (!is_valid_path_z_and_direction(test_element, adjac_z, adjac_dir))
if (!is_valid_path_z_and_direction(test_element, adjacPos.z, adjac_dir))
continue;
/* test_element is a connected path */

2
src/openrct2/peep/Staff.h
View File

@@ -77,7 +77,7 @@ void staff_reset_modes();
void staff_set_name(uint16_t spriteIndex, const char* name);
bool staff_hire_new_member(STAFF_TYPE staffType, ENTERTAINER_COSTUME entertainerType);
void staff_update_greyed_patrol_areas();
bool staff_is_location_on_patrol_edge(Peep* mechanic, int32_t x, int32_t y);
bool staff_is_location_on_patrol_edge(Peep* mechanic, const CoordsXY& loc);
bool staff_can_ignore_wide_flag(Peep* mechanic, int32_t x, int32_t y, uint8_t z, TileElement* path);
void staff_reset_stats();
bool staff_is_patrol_area_set_for_type(STAFF_TYPE type, const CoordsXY& coords);