From 7e0ca9489d53776642ee389fe9ec461d2d19a6b7 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 7 May 2006 11:41:44 +0000 Subject: [PATCH] (svn r4769) - Newstations: add newstations ttdpatch flag --- newgrf.c | 1 + rail_cmd.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/newgrf.c b/newgrf.c index db99677feb..5f879063f8 100644 --- 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 */ diff --git a/rail_cmd.c b/rail_cmd.c index c85019ff62..b4ed546e65 100644 --- 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;