dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #5713: FindClosestShipDepot only considers depots that are actually reachable (#11768)

Browse Source 
(cherry picked from commit 8a4a99b7e8)
This commit is contained in:
Kuhnovic
2024-01-27 15:06:14 +01:00
committed by Jonathan G Rennison
parent f9321686a7
commit a7c2f489f6
4 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pathfinder/water_regions.cpp
View File

@@ -27,6 +27,7 @@ constexpr TWaterRegionPatchLabel FIRST_REGION_LABEL = 1;
constexpr TWaterRegionPatchLabel INVALID_WATER_REGION_PATCH = 0;
static_assert(sizeof(TWaterRegionTraversabilityBits) * 8 == WATER_REGION_EDGE_LENGTH);
static_assert(sizeof(TWaterRegionPatchLabel) == sizeof(byte)); // Important for the hash calculation.
static inline TrackBits GetWaterTracks(TileIndex tile) { return TrackStatusToTrackBits(GetTileTrackStatus(tile, TRANSPORT_WATER, 0)); }
static inline bool IsAqueductTile(TileIndex tile) { return IsBridgeTile(tile) && GetTunnelBridgeTransportType(tile) == TRANSPORT_WATER; }
@@ -318,14 +319,23 @@ WaterRegionReference GetUpdatedWaterRegion(TileIndex tile)
}
/**
* Returns the index of the water region
* @param water_region The Water region to return the index for
* Returns the index of the water region.
* @param water_region The water region to return the index for.
*/
TWaterRegionIndex GetWaterRegionIndex(const WaterRegionDesc &water_region)
{
return GetWaterRegionIndex(water_region.x, water_region.y);
}
/**
* Calculates a number that uniquely identifies the provided water region patch.
* @param water_region_patch The Water region to calculate the hash for.
*/
uint32_t CalculateWaterRegionPatchHash(const WaterRegionPatchDesc &water_region_patch)
{
return water_region_patch.label | GetWaterRegionIndex(water_region_patch) << 8;
}
/**
* Returns the center tile of a particular water region.
* @param water_region The water region to find the center tile for.

2
src/pathfinder/water_regions.h
View File

@@ -58,6 +58,8 @@ struct WaterRegionDesc
TWaterRegionIndex GetWaterRegionIndex(const WaterRegionDesc &water_region);
uint32_t CalculateWaterRegionPatchHash(const WaterRegionPatchDesc &water_region_patch);
TileIndex GetWaterRegionCenterTile(const WaterRegionDesc &water_region);
WaterRegionDesc GetWaterRegionInfo(TileIndex tile);

4
src/pathfinder/yapf/yapf_ship_regions.cpp
View File

@@ -25,14 +25,12 @@ constexpr uint32_t MAX_NUMBER_OF_NODES = 65536;
struct CYapfRegionPatchNodeKey {
WaterRegionPatchDesc m_water_region_patch;
static_assert(sizeof(TWaterRegionPatchLabel) == sizeof(byte)); // Important for the hash calculation.
inline void Set(const WaterRegionPatchDesc &water_region_patch)
{
m_water_region_patch = water_region_patch;
}
inline int CalcHash() const { return m_water_region_patch.label | GetWaterRegionIndex(m_water_region_patch) << 8; }
inline uint32_t CalcHash() const { return CalculateWaterRegionPatchHash(m_water_region_patch); }
inline bool operator==(const CYapfRegionPatchNodeKey &other) const { return CalcHash() == other.CalcHash(); }
};