# HG changeset patch
# User peter1138
# Date 1147002104 0
# Node ID bffc9d12cfba2104f6069e495cd0697cd3534a2d
# Parent  1a8d467577f45395f43bff956176f0bb0db12378
(svn r4769) - Newstations: add newstations ttdpatch flag

diff -r 1a8d467577f4 -r bffc9d12cfba newgrf.c
--- a/newgrf.c	Sun May 07 11:40:53 2006 +0000
+++ b/newgrf.c	Sun May 07 11:41:44 2006 +0000
@@ -2476,6 +2476,7 @@
 	                   | (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 */
diff -r 1a8d467577f4 -r bffc9d12cfba rail_cmd.c
--- a/rail_cmd.c	Sun May 07 11:40:53 2006 +0000
+++ b/rail_cmd.c	Sun May 07 11:41:44 2006 +0000
@@ -852,7 +852,7 @@
 {
 	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;