Merge 1e1b2c8037 into c69fc76395

Codefix: Rail type bridge offset is not a SpriteID. (#14471 )
Change: Convert house placer protection buttons to a single toggle
2025-07-21 20:02:14 +00:00 · 2025-07-21 20:00:04 +00:00 · 2025-07-21 14:18:29 -04:00 · 2025-07-21 14:18:29 -04:00
3 changed files with 3 additions and 2 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
@ -2940,7 +2940,7 @@ CommandCost CmdPlaceHouse(DoCommandFlags flags, TileIndex tile, HouseID house, b

 		/* We might be overbuilding an existing house, otherwise check if we can clear land. */
 		if (!(overbuild && GetTileType(subtile) == MP_HOUSE)) {
-			CommandCost cost = Command<CMD_LANDSCAPE_CLEAR>::Do({ DoCommandFlag::Auto, DoCommandFlag::NoWater }, subtile);
+			CommandCost cost = Command<CMD_LANDSCAPE_CLEAR>::Do({DoCommandFlag::Auto, DoCommandFlag::NoWater}, subtile);
 			if (!cost.Succeeded()) return cost;
 		}
 	}
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@ -1741,6 +1741,7 @@ struct BuildHouseWindow : public PickerWindow {
 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
 				this->SetDirty();
 				break;
+
 			case WID_BH_OVERBUILD_TOGGLE:
 				BuildHouseWindow::overbuild = !BuildHouseWindow::overbuild;
 				this->SetWidgetLoweredState(WID_BH_OVERBUILD_TOGGLE, BuildHouseWindow::overbuild);
Author	SHA1	Message	Date
Tyler Trahan	13f3316fdb	Merge `1e1b2c8037` into `c69fc76395`	2025-07-21 20:02:14 +00:00
Peter Nelson	c69fc76395	Codefix: Rail type bridge offset is not a SpriteID. (#14471 )	2025-07-21 20:00:04 +00:00
Tyler Trahan	1e1b2c8037	Change: Convert house placer protection buttons to a single toggle	2025-07-21 14:18:29 -04:00
Tyler Trahan	632029e277	Feature: House placer mode to overbuild existing houses	2025-07-21 14:18:29 -04:00