mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-19 05:52:27 +01:00
Code Issues Releases Wiki Activity

Reduce memory footprint for history, cleanup code

Browse Source
This commit is contained in:
ζeh Matt
2024-09-30 12:36:01 +03:00
parent 96b6d3412f
commit fdff60552b
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/openrct2/peep/GuestPathfinding.cpp
View File

@@ -33,21 +33,29 @@ RideId gPeepPathFindQueueRideIndex;
namespace OpenRCT2::PathFinding namespace OpenRCT2::PathFinding
{ {
// The search limits the maximum junctions by certain conditions.
static constexpr uint8_t kMaxJunctionsStaff = 8;
static constexpr uint8_t kMaxJunctionsGuest = 5;
static constexpr uint8_t kMaxJunctionsGuestWithMap = 7;
static constexpr uint8_t kMaxJunctionsGuestLeavingPark = 7;
static constexpr uint8_t kMaxJunctionsGuestLeavingParkLost = 8;
// Maximum amount of junctions.
static constexpr uint8_t kMaxJunctions = std::max({ kMaxJunctionsStaff, kMaxJunctionsGuest, kMaxJunctionsGuestWithMap,
kMaxJunctionsGuestLeavingPark, kMaxJunctionsGuestLeavingParkLost });
struct PathFindingState struct PathFindingState
{ {
int8_t junctionCount; int8_t junctionCount;
int8_t maxJunctions; int8_t maxJunctions;
int32_t countTilesChecked; int32_t countTilesChecked;
/* A junction history for the peep pathfinding heuristic search // A junction history for the peep path finding heuristic search.
* The magic number 16 is the largest value returned by
* PeepPathfindGetMaxNumberJunctions() which should eventually
* be declared properly. */
struct struct
{ {
TileCoordsXYZ location; TileCoordsXYZ location;
Direction direction; Direction direction;
} history[16]; } history[kMaxJunctions + 1];
}; };
static int32_t GuestSurfacePathFinding(Peep& peep); static int32_t GuestSurfacePathFinding(Peep& peep);
@@ -553,24 +561,25 @@ namespace OpenRCT2::PathFinding
static uint8_t PeepPathfindGetMaxNumberJunctions(Peep& peep) static uint8_t PeepPathfindGetMaxNumberJunctions(Peep& peep)
{ {
if (peep.Is<Staff>()) if (peep.Is<Staff>())
return 8; return kMaxJunctionsStaff;
auto* guest = peep.As<Guest>(); auto* guest = peep.As<Guest>();
if (guest == nullptr) if (guest == nullptr)
return 8; return kMaxJunctionsStaff;
if (guest->PeepFlags & PEEP_FLAGS_LEAVING_PARK && guest->GuestIsLostCountdown < 90) bool isLeavingPark = (guest->PeepFlags & PEEP_FLAGS_LEAVING_PARK) != 0;
if (isLeavingPark && guest->GuestIsLostCountdown < 90)
{ {
return 8; return kMaxJunctionsGuestLeavingParkLost;
} }
if (isLeavingPark)
return kMaxJunctionsGuestLeavingPark;
if (guest->HasItem(ShopItem::Map)) if (guest->HasItem(ShopItem::Map))
return 7; return kMaxJunctionsGuestWithMap;
if (guest->PeepFlags & PEEP_FLAGS_LEAVING_PARK) return kMaxJunctionsGuest;
return 7;
return 5;
} }
/** /**