Feature: Add NotRoadTypes (NRT)

1 files changed, 18 insertions, 3 deletions

diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index b11290ae4..710c591ca 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -13,6 +13,7 @@
 #include "error.h"
 #include "command_func.h"
 #include "rail.h"
+#include "road.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "sound_func.h"
@@ -403,11 +404,25 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
 
 		Money infra_cost = 0;
 		switch (transport_type) {
-			case TRANSPORT_ROAD:
-				infra_cost = (bridge_len + 2) * _price[PR_BUILD_ROAD] * 2;
+			case TRANSPORT_ROAD: {
 				/* In case we add a new road type as well, we must be aware of those costs. */
-				if (IsBridgeTile(start)) infra_cost *= CountBits(GetRoadTypes(start) | (RoadTypes)road_rail_type);
+				RoadType road_rt = INVALID_ROADTYPE;
+				RoadType tram_rt = INVALID_ROADTYPE;
+				if (IsBridgeTile(start)) {
+					road_rt = GetRoadTypeRoad(start);
+					tram_rt = GetRoadTypeTram(start);
+				}
+				if (RoadTypeIsRoad((RoadType)road_rail_type)) {
+					road_rt = (RoadType)road_rail_type;
+				} else {
+					tram_rt = (RoadType)road_rail_type;
+				}
+
+				if (road_rt != INVALID_ROADTYPE) infra_cost += (bridge_len + 2) * 2 * RoadBuildCost(road_rt);
+				if (tram_rt != INVALID_ROADTYPE) infra_cost += (bridge_len + 2) * 2 * RoadBuildCost(tram_rt);
+
 				break;
+			}
 			case TRANSPORT_RAIL: infra_cost = (bridge_len + 2) * RailBuildCost((RailType)road_rail_type); break;
 			default: break;
 		}