mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-04 06:00:15 +00:00
(svn r4769) - Newstations: add newstations ttdpatch flag
This commit is contained in:
parent
99cb906265
commit
7e0ca9489d
1
newgrf.c
1
newgrf.c
@ -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 */
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user