diff options
| author | glx <glx@openttd.org> | 2008-01-03 23:54:23 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2008-01-03 23:54:23 +0000 |
| commit | 72afdb8d3440dc3570dd6d4c4b3127f1e7345642 (patch) | |
| tree | bbec8af9e203adb15cc08783b1ea8a8a70114806 /src/road_cmd.cpp | |
| parent | 42bddcf723fdcabf6ea8d4069effc086710ef156 (diff) | |
| download | openttd-72afdb8d3440dc3570dd6d4c4b3127f1e7345642.tar.xz | |
(svn r11750) -Revert (r11749): commited too much
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 015f8c1be..90afac8de 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -201,8 +201,9 @@ CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) c &= present; if (c == ROAD_NONE) return CMD_ERROR; - ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); if (flags & DC_EXEC) { + ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); + present ^= c; if (present == ROAD_NONE) { RoadTypes rts = GetRoadTypes(tile) & ComplementRoadTypes(RoadTypeToRoadTypes(rt)); @@ -235,11 +236,11 @@ CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) * we can't draw the crossing without trambits ;) */ if (rt == ROADTYPE_ROAD && HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) && ((flags & DC_EXEC) || !HasBit(p1, 6))) return CMD_ERROR; - if (rt == ROADTYPE_ROAD) { - ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); - } - if (flags & DC_EXEC) { + if (rt == ROADTYPE_ROAD) { + ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); + } + RoadTypes rts = GetRoadTypes(tile) & ComplementRoadTypes(RoadTypeToRoadTypes(rt)); if (rts == ROADTYPES_NONE) { MakeRailNormal(tile, GetTileOwner(tile), GetCrossingRailBits(tile), GetRailType(tile)); |