Merge cdeefe7bd8 into c69fc76395

Codefix: Rail type bridge offset is not a SpriteID. (#14471 )
Fix #9903 : Don't build houses around half-tile roads after a bridge or tunnel
2025-07-21 20:00:12 +00:00 · 2025-07-21 20:00:04 +00:00 · 2024-07-01 03:34:06 +05:00
2 changed files with 4 additions and 1 deletions
--- a/src/rail.h
+++ b/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.
--- a/src/town_cmd.cpp
+++ b/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();
Author	SHA1	Message	Date
dP	c1de1dd777	Merge `cdeefe7bd8` into `c69fc76395`	2025-07-21 20:00:12 +00:00
Peter Nelson	c69fc76395	Codefix: Rail type bridge offset is not a SpriteID. (#14471 )	2025-07-21 20:00:04 +00:00
dP	cdeefe7bd8	Fix #9903 : Don't build houses around half-tile roads after a bridge or tunnel	2024-07-01 03:34:06 +05:00