Add: [NewGRF] Bridge pillar exclusion information for stations and roadstops.

NewGRF stations and roadstops can now specify bridge pillar and minimum height information for their tiles.

src/bridge_type.h

@@ -55,4 +55,10 @@ static constexpr BridgePillarFlags BRIDGEPILLARFLAGS_ALL{
 	BridgePillarFlag::EdgeNE, BridgePillarFlag::EdgeSE, BridgePillarFlag::EdgeSW, BridgePillarFlag::EdgeNW,
 };
 
+/** Information about a tile structure that may have a bridge above. */
+struct BridgeableTileInfo {
+	uint8_t height = 0; ///< Minimum height for a bridge above. 0 means a bridge is not allowed.
+	BridgePillarFlags disallowed_pillars = BRIDGEPILLARFLAGS_ALL; ///< Disallowed pillar flags for a bridge above
+};
+
 #endif /* BRIDGE_TYPE_H */

src/newgrf/newgrf_act0_roadstops.cpp

@@ -49,6 +49,13 @@ static ChangeInfoResult IgnoreRoadStopProperty(uint prop, ByteReader &buf)
 			buf.ReadDWord();
 			break;
 
+		case 0x13:
+		case 0x14:
+			buf.ReadWord();
+			buf.ReadWord();
+			buf.ReadWord();
+			break;
+
 		case 0x16: // Badge list
 			SkipBadgeList(buf);
 			break;
@@ -134,6 +141,30 @@ static ChangeInfoResult RoadStopChangeInfo(uint first, uint last, int prop, Byte
 				rs->flags = static_cast<RoadStopSpecFlags>(buf.ReadDWord()); // Future-proofing, size this as 4 bytes, but we only need two byte's worth of flags at present
 				break;
 
+			case 0x13: { // Minimum bridge height for each of the roadstop's tile layouts.
+				uint16_t tiles = buf.ReadExtendedByte();
+				for (uint j = 0; j != tiles; ++j) {
+					if (j < std::size(rs->bridgeable_info)) {
+						rs->bridgeable_info[j].height = buf.ReadByte();
+					} else {
+						buf.ReadByte();
+					}
+				}
+				break;
+			}
+
+			case 0x14: { // Disallowed pillars for each of the roadstop's tile layouts.
+				uint16_t tiles = buf.ReadExtendedByte();
+				for (uint j = 0; j != tiles; ++j) {
+					if (j < std::size(rs->bridgeable_info)) {
+						rs->bridgeable_info[j].disallowed_pillars = BridgePillarFlags{buf.ReadByte()};
+					} else {
+						buf.ReadByte();
+					}
+				}
+				break;
+			}
+
 			case 0x15: // Cost multipliers
 				rs->build_cost_multiplier = buf.ReadByte();
 				rs->clear_cost_multiplier = buf.ReadByte();

src/newgrf/newgrf_act0_stations.cpp

@@ -294,6 +294,24 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 				statspec->badges = ReadBadgeList(buf, GSF_STATIONS);
 				break;
 
+			case 0x20: { // Minimum bridge height (extended)
+				uint16_t tiles = buf.ReadExtendedByte();
+				if (statspec->bridgeable_info.size() < tiles) statspec->bridgeable_info.resize(tiles);
+				for (int j = 0; j != tiles; ++j) {
+					statspec->bridgeable_info[j].height = buf.ReadByte();
+				}
+				break;
+			}
+
+			case 0x21: { // Disallowed bridge pillars
+				uint16_t tiles = buf.ReadExtendedByte();
+				if (statspec->bridgeable_info.size() < tiles) statspec->bridgeable_info.resize(tiles);
+				for (int j = 0; j != tiles; ++j) {
+					statspec->bridgeable_info[j].disallowed_pillars = BridgePillarFlags{buf.ReadByte()};
+				}
+				break;
+			}
+
 			default:
 				ret = CIR_UNKNOWN;
 				break;

src/newgrf_roadstop.h

@@ -12,6 +12,7 @@
 #ifndef NEWGRF_ROADSTATION_H
 #define NEWGRF_ROADSTATION_H
 
+#include "bridge_type.h"
 #include "newgrf_animation_type.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_badge_type.h"
@@ -138,12 +139,10 @@ struct RoadStopSpec : NewGRFSpecBase<RoadStopClassID> {
 
 	AnimationInfo<StationAnimationTriggers> animation;
 
-	uint8_t bridge_height[6];             ///< Minimum height for a bridge above, 0 for none
-	uint8_t bridge_disallowed_pillars[6]; ///< Disallowed pillar flags for a bridge above
-
 	uint8_t build_cost_multiplier = 16;  ///< Build cost multiplier per tile.
 	uint8_t clear_cost_multiplier = 16;  ///< Clear cost multiplier per tile.
 
+	std::array<BridgeableTileInfo, 6> bridgeable_info{}; ///< Per tile layout bridge information.
 	std::vector<BadgeID> badges;
 
 	/**

src/newgrf_station.h

@@ -11,6 +11,7 @@
 #define NEWGRF_STATION_H
 
 #include "core/enum_type.hpp"
+#include "bridge_type.h"
 #include "newgrf_animation_type.h"
 #include "newgrf_badge_type.h"
 #include "newgrf_callbacks.h"
@@ -169,6 +170,7 @@ struct StationSpec : NewGRFSpecBase<StationClassID> {
 	};
 	using TileFlags = EnumBitSet<TileFlag, uint8_t>;
 	std::vector<TileFlags> tileflags; ///< List of tile flags.
+	std::vector<BridgeableTileInfo> bridgeable_info; ///< Per tile layout bridge information.
 
 	AnimationInfo<StationAnimationTriggers> animation;