# HG changeset patch
# User Niels Martin Hansen <nielsm@indvikleren.dk>
# Date 2020-02-09 19:24:56
# Node ID 6898ff80efc80e38c1f41bf5bb0e735a9a0294a5
# Parent  c2d839fb3157560946c1e0230db4719af6a570a3

Fix #7958: Use NewGRF provided catenary sprites when either front or back is overridden

diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -1121,12 +1121,12 @@ static void GetBridgeRoadCatenary(const 
 	/* Simplified from DrawRoadTypeCatenary() to remove all the special cases required for regular ground road */
 	spr_back = GetCustomRoadSprite(rti, head_tile, ROTSG_CATENARY_BACK, head ? TCX_NORMAL : TCX_ON_BRIDGE);
 	spr_front = GetCustomRoadSprite(rti, head_tile, ROTSG_CATENARY_FRONT, head ? TCX_NORMAL : TCX_ON_BRIDGE);
-	if (spr_back == 0 || spr_front == 0) {
+	if (spr_back == 0 && spr_front == 0) {
 		spr_back = SPR_TRAMWAY_BASE + back_offsets[offset];
 		spr_front = SPR_TRAMWAY_BASE + front_offsets[offset];
 	} else {
-		spr_back += 23 + offset;
-		spr_front += 23 + offset;
+		if (spr_back != 0) spr_back += 23 + offset;
+		if (spr_front != 0) spr_front += 23 + offset;
 	}
 }