From 617bb698aed977359a6fb7075e25ea7c6934913f Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Tue, 29 Jun 2021 00:03:45 +0200 Subject: [PATCH] Use UK spelling of center --- src/openrct2/peep/Guest.cpp | 8 ++++---- src/openrct2/peep/GuestPathfinding.cpp | 6 +++--- test/tests/Pathfinding.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index fb8ca06d0f..828082215b 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -4974,15 +4974,15 @@ void Guest::UpdateRideShopInteract() if (ride == nullptr) return; - const int16_t tileCenterX = NextLoc.x + 16; - const int16_t tileCenterY = NextLoc.y + 16; + const int16_t tileCentreX = NextLoc.x + 16; + const int16_t tileCentreY = NextLoc.y + 16; if (ride->type == RIDE_TYPE_FIRST_AID) { if (Nausea <= 35) { RideSubState = PeepRideSubState::LeaveShop; - SetDestination({ tileCenterX, tileCenterY }, 3); + SetDestination({ tileCentreX, tileCentreY }, 3); HappinessTarget = std::min(HappinessTarget + 30, PEEP_MAX_HAPPINESS); Happiness = HappinessTarget; } @@ -5008,7 +5008,7 @@ void Guest::UpdateRideShopInteract() RideSubState = PeepRideSubState::LeaveShop; - SetDestination({ tileCenterX, tileCenterY }, 3); + SetDestination({ tileCentreX, tileCentreY }, 3); HappinessTarget = std::min(HappinessTarget + 30, PEEP_MAX_HAPPINESS); Happiness = HappinessTarget; diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index ecd4a6845f..9bf83c9a7f 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -135,18 +135,18 @@ static int32_t peep_move_one_tile(Direction direction, Peep* peep) if (peep->State != PeepState::Queuing) { // When peeps are walking along a path, we would like them to be spread out across the width of the path, - // instead of all walking along the exact center line of the path. + // instead of all walking along the exact centre line of the path. // // Setting a random DestinationTolerance does not work very well for this. It means that peeps will make // their new pathfinding decision at a random time, and so will distribute a bit when they are turning // corners (which is good); but, as they walk along a straight path, they will - eventually - have had a - // low tolerance value which forced them back to the center of the path, where they stay until they turn + // low tolerance value which forced them back to the centre of the path, where they stay until they turn // a corner. // // What we want instead is to apply that randomness in the direction they are walking ONLY, and keep their // other coordinate constant. // - // However, we have also seen some situations where guests end up too far from the center of paths. We've + // However, we have also seen some situations where guests end up too far from the centre of paths. We've // not identified exactly what causes this yet, but to limit the impact of it, we don't just keep the other // coordinate constant, but instead clamp it to an acceptable range. This brings in 'outlier' guests from // the edges of the path, while allowing guests who are already in an acceptable position to stay there. diff --git a/test/tests/Pathfinding.cpp b/test/tests/Pathfinding.cpp index 4986ea0140..df55e74b3e 100644 --- a/test/tests/Pathfinding.cpp +++ b/test/tests/Pathfinding.cpp @@ -68,7 +68,7 @@ protected: { // Our start position is in tile coordinates, but we need to give the peep spawn // position in actual world coords (32 units per tile X/Y, 8 per Z level). - // Add 16 so the peep spawns in the center of the tile. + // Add 16 so the peep spawns in the centre of the tile. auto* peep = Guest::Generate(pos->ToCoordsXYZ().ToTileCentre()); // Peeps that are outside of the park use specialized pathfinding which we don't want to