mirror of https://github.com/OpenRCT2/OpenRCT2.git
Improve method name for level crossing check
This commit is contained in:
parent
bba54d2ecc
commit
7c2ec714f7
|
@ -5289,7 +5289,7 @@ void Guest::UpdateWalking()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PathIsBlockedByVehicle())
|
if (ShouldWaitForLevelCrossing())
|
||||||
{
|
{
|
||||||
// Wait for vehicle to pass
|
// Wait for vehicle to pass
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -321,7 +321,7 @@ bool Peep::CheckForPath()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Peep::PathIsBlockedByVehicle()
|
bool Peep::ShouldWaitForLevelCrossing()
|
||||||
{
|
{
|
||||||
auto curPos = TileCoordsXYZ(GetLocation());
|
auto curPos = TileCoordsXYZ(GetLocation());
|
||||||
if (FootpathIsBlockedByVehicle(curPos))
|
if (FootpathIsBlockedByVehicle(curPos))
|
||||||
|
|
|
@ -412,7 +412,7 @@ public: // Peep
|
||||||
// TODO: Make these private again when done refactoring
|
// TODO: Make these private again when done refactoring
|
||||||
public: // Peep
|
public: // Peep
|
||||||
[[nodiscard]] bool CheckForPath();
|
[[nodiscard]] bool CheckForPath();
|
||||||
bool PathIsBlockedByVehicle();
|
bool ShouldWaitForLevelCrossing();
|
||||||
bool IsOnLevelCrossing();
|
bool IsOnLevelCrossing();
|
||||||
void PerformNextAction(uint8_t& pathing_result);
|
void PerformNextAction(uint8_t& pathing_result);
|
||||||
void PerformNextAction(uint8_t& pathing_result, TileElement*& tile_result);
|
void PerformNextAction(uint8_t& pathing_result, TileElement*& tile_result);
|
||||||
|
|
|
@ -1338,7 +1338,7 @@ void Staff::UpdateHeadingToInspect()
|
||||||
if (!CheckForPath())
|
if (!CheckForPath())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (PathIsBlockedByVehicle() && !IsMechanicHeadingToFixRideBlockingPath())
|
if (ShouldWaitForLevelCrossing() && !IsMechanicHeadingToFixRideBlockingPath())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
uint8_t pathingResult;
|
uint8_t pathingResult;
|
||||||
|
@ -1446,7 +1446,7 @@ void Staff::UpdateAnswering()
|
||||||
if (!CheckForPath())
|
if (!CheckForPath())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (PathIsBlockedByVehicle() && !IsMechanicHeadingToFixRideBlockingPath())
|
if (ShouldWaitForLevelCrossing() && !IsMechanicHeadingToFixRideBlockingPath())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
uint8_t pathingResult;
|
uint8_t pathingResult;
|
||||||
|
@ -1781,7 +1781,7 @@ void Staff::UpdatePatrolling()
|
||||||
if (!CheckForPath())
|
if (!CheckForPath())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (PathIsBlockedByVehicle() && !IsMechanicHeadingToFixRideBlockingPath())
|
if (ShouldWaitForLevelCrossing() && !IsMechanicHeadingToFixRideBlockingPath())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
uint8_t pathingResult;
|
uint8_t pathingResult;
|
||||||
|
|
Loading…
Reference in New Issue