Merge 43310ae9ea into 1d21edde8d

src/rail.h

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

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;
 		}
 	}

src/town_gui.cpp

@@ -1741,7 +1741,6 @@ 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);