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

Change custom bridge head second rail type infrastructure count factor

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-12-22 18:44:16 +00:00
parent 70020e1a5c
commit afae7ca810
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tunnelbridge_map.h
View File

@@ -223,7 +223,6 @@ static inline bool HasAcrossTunnelBridgeReservation(TileIndex t)
*/ */
static inline uint GetTunnelBridgeHeadOnlyRailInfrastructureCountFromTrackBits(TrackBits bits) static inline uint GetTunnelBridgeHeadOnlyRailInfrastructureCountFromTrackBits(TrackBits bits)
{ {
if (!bits) return 0;
uint pieces = CountBits(bits); uint pieces = CountBits(bits);
if (TracksOverlap(bits)) pieces *= pieces; if (TracksOverlap(bits)) pieces *= pieces;
return (TUNNELBRIDGE_TRACKBIT_FACTOR / 2) * (1 + pieces); return (TUNNELBRIDGE_TRACKBIT_FACTOR / 2) * (1 + pieces);
@@ -248,7 +247,7 @@ static inline uint GetTunnelBridgeHeadOnlyPrimaryRailInfrastructureCount(TileInd
*/ */
static inline uint GetTunnelBridgeHeadOnlySecondaryRailInfrastructureCount(TileIndex t) static inline uint GetTunnelBridgeHeadOnlySecondaryRailInfrastructureCount(TileIndex t)
{ {
return IsBridge(t) ? GetTunnelBridgeHeadOnlyRailInfrastructureCountFromTrackBits(GetSecondaryTunnelBridgeTrackBits(t)) : 0; return IsBridge(t) && GetSecondaryTunnelBridgeTrackBits(t) ? (TUNNELBRIDGE_TRACKBIT_FACTOR / 2) : 0;
} }
/** /**