(svn r4769) - Newstations: add newstations ttdpatch flag

19 years ago · 7e0ca9489d
parent 99cb906265
commit 7e0ca9489d
2 changed files with 2 additions and 1 deletions
--- a/newgrf.c
+++ b/newgrf.c
@ -2476,6 +2476,7 @@ static void InitializeGRFSpecial(void)
 	                   | (1 << 0x1C); /* electrifiedrailway */

 	_ttdpatch_flags[2] = (_patches.build_on_slopes ? (1 << 0x0D) : 0)       /* buildonslopes */
+	                   | (1 << 0x12)  /* newstations */
 	                   | (_patches.build_on_slopes ? (1 << 0x15) : 0)       /* buildoncoasts */
 	                   | (1 << 0x16)  /* canals */
 	                   | (1 << 0x17)  /* newstartyear */
--- a/rail_cmd.c
+++ b/rail_cmd.c
@ -852,7 +852,7 @@ static int32 DoConvertRail(TileIndex tile, RailType totype, bool exec)
 {
 	if (!CheckTileOwnership(tile)) return CMD_ERROR;

-	if (!EnsureNoVehicle(tile) && (!IsCompatibleRail(GetRailType(tile), totype) || IsPlainRailTile(tile))) return CMD_ERROR;
+	if (!(EnsureNoVehicle(tile) || (GetRailType(tile) == RAILTYPE_RAIL && totype == RAILTYPE_ELECTRIC)) && (!IsCompatibleRail(GetRailType(tile), totype) || IsPlainRailTile(tile))) return CMD_ERROR;

 	// tile is already of requested type?
 	if (GetRailType(tile) == totype) return CMD_ERROR;