miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kuhnovic
2024-01-27 15:06:14 +01:00
committed by GitHub
parent 89520f5665
commit 8a4a99b7e8
4 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pathfinder/water_regions.cpp
+12 -2
View File
@@ -25,6 +25,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; }
@@ -225,14 +226,23 @@ WaterRegion &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.
*/
int 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.