Merge cdeefe7bd8 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/town_cmd.cpp

@@ -1623,6 +1623,9 @@ static TownGrowthResult GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, Dia
 			return TownGrowthResult::Continue;
 		}
 
+		/* Don't build houses around half-tile roads in the rare case we ended up on one. */
+		if (HasExactlyOneBit(cur_rb)) allow_house = false;
+
 		/* Possibly extend the road in a direction.
 		 * Randomize a direction and if it has a road, bail out. */
 		target_dir = RandomDiagDir();