dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4769) - Newstations: add newstations ttdpatch flag

Browse Source
This commit is contained in:
peter1138
2006-05-07 11:41:44 +00:00
parent 0f6dc99fb5
commit d3fea69041
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
newgrf.c
View File

@@ -2476,6 +2476,7 @@ static void InitializeGRFSpecial(void)
| (1 << 0x1C); /* electrifiedrailway */ | (1 << 0x1C); /* electrifiedrailway */
_ttdpatch_flags[2] = (_patches.build_on_slopes ? (1 << 0x0D) : 0) /* buildonslopes */ _ttdpatch_flags[2] = (_patches.build_on_slopes ? (1 << 0x0D) : 0) /* buildonslopes */
| (1 << 0x12) /* newstations */
| (_patches.build_on_slopes ? (1 << 0x15) : 0) /* buildoncoasts */ | (_patches.build_on_slopes ? (1 << 0x15) : 0) /* buildoncoasts */
| (1 << 0x16) /* canals */ | (1 << 0x16) /* canals */
| (1 << 0x17) /* newstartyear */ | (1 << 0x17) /* newstartyear */

2
rail_cmd.c
View File

@@ -852,7 +852,7 @@ static int32 DoConvertRail(TileIndex tile, RailType totype, bool exec)
{ {
if (!CheckTileOwnership(tile)) return CMD_ERROR; 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? // tile is already of requested type?
if (GetRailType(tile) == totype) return CMD_ERROR; if (GetRailType(tile) == totype) return CMD_ERROR;