Merge 38462627db into c69fc76395

src/rail.h

@@ -184,7 +184,7 @@ public:
 	/**
 	 * Bridge offset
 	 */
-	SpriteID bridge_offset;
+	uint8_t bridge_offset;
 
 	/**
 	 * Original railtype number to use when drawing non-newgrf railtypes, or when drawing stations.

src/tile_map.cpp

@@ -120,12 +120,14 @@ int GetTileZ(TileIndex tile)
 	uint x2 = std::min(x1 + 1, Map::MaxX());
 	uint y2 = std::min(y1 + 1, Map::MaxY());
 
-	return std::min({
+	return std::min(
-		TileHeight(tile),           // N corner
+		std::min(
-		TileHeight(TileXY(x2, y1)), // W corner
+			TileHeight(tile),            // N corner
-		TileHeight(TileXY(x1, y2)), // E corner
+			TileHeight(TileXY(x2, y1))), // W corner
-		TileHeight(TileXY(x2, y2)), // S corner
+		std::min(
-	});
+			TileHeight(TileXY(x1, y2)),  // E corner
+			TileHeight(TileXY(x2, y2)))  // S corner
+	);
 }
 
 /**
@@ -140,10 +142,12 @@ int GetTileMaxZ(TileIndex t)
 	uint x2 = std::min(x1 + 1, Map::MaxX());
 	uint y2 = std::min(y1 + 1, Map::MaxY());
 
-	return std::max({
+	return std::max(
-		TileHeight(t),              // N corner
+		std::max(
-		TileHeight(TileXY(x2, y1)), // W corner
+			TileHeight(t),               // N corner
-		TileHeight(TileXY(x1, y2)), // E corner
+			TileHeight(TileXY(x2, y1))), // W corner
-		TileHeight(TileXY(x2, y2)), // S corner
+		std::max(
-	});
+			TileHeight(TileXY(x1, y2)),  // E corner
+			TileHeight(TileXY(x2, y2)))  // S corner
+	);
 }