diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-02 22:57:47 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-02 22:57:47 +0000 |
| commit | 7831346ef8924c757fbd763c225c7b29b665604f (patch) | |
| tree | 7514d56ab72b15863906486d7256f8e5dd2cef01 /src/rail_cmd.cpp | |
| parent | 6dd3703a4caafff9a56d878ffac6ce322739067d (diff) | |
| download | openttd-7831346ef8924c757fbd763c225c7b29b665604f.tar.xz | |
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
Diffstat (limited to 'src/rail_cmd.cpp')
| -rw-r--r-- | src/rail_cmd.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 13955b8b6..1e5573881 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -378,20 +378,17 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u roadtypes |= ROADTYPES_ROAD; break; - case ROADTYPES_ROADTRAM: if (road == tram) break; - /* FALL THROUGH */ - case ROADTYPES_ROADHWAY: // Road and highway are incompatible in this case - case ROADTYPES_TRAMHWAY: // Tram and highway are incompatible in this case - case ROADTYPES_ALL: // Also incompatible - return CMD_ERROR; + case ROADTYPES_ALL: + if (road != tram) return CMD_ERROR; + break; } - road |= tram | GetRoadBits(tile, ROADTYPE_HWAY); + road |= tram; if ((track == TRACK_X && road == ROAD_Y) || (track == TRACK_Y && road == ROAD_X)) { if (flags & DC_EXEC) { - MakeRoadCrossing(tile, GetRoadOwner(tile, ROADTYPE_ROAD), GetRoadOwner(tile, ROADTYPE_TRAM), GetRoadOwner(tile, ROADTYPE_HWAY), _current_company, (track == TRACK_X ? AXIS_Y : AXIS_X), railtype, roadtypes, GetTownIndex(tile)); + MakeRoadCrossing(tile, GetRoadOwner(tile, ROADTYPE_ROAD), GetRoadOwner(tile, ROADTYPE_TRAM), _current_company, (track == TRACK_X ? AXIS_Y : AXIS_X), railtype, roadtypes, GetTownIndex(tile)); UpdateLevelCrossing(tile, false); } break; @@ -475,7 +472,7 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, if (v != NULL) FreeTrainTrackReservation(v); } owner = GetTileOwner(tile); - MakeRoadNormal(tile, GetCrossingRoadBits(tile), GetRoadTypes(tile), GetTownIndex(tile), GetRoadOwner(tile, ROADTYPE_ROAD), GetRoadOwner(tile, ROADTYPE_TRAM), GetRoadOwner(tile, ROADTYPE_HWAY)); + MakeRoadNormal(tile, GetCrossingRoadBits(tile), GetRoadTypes(tile), GetTownIndex(tile), GetRoadOwner(tile, ROADTYPE_ROAD), GetRoadOwner(tile, ROADTYPE_TRAM)); } break; } |