diff options
| author | glx <glx@openttd.org> | 2008-01-03 23:50:58 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2008-01-03 23:50:58 +0000 |
| commit | e9a35fd75dcde4bc262386f11f41e425a12dac11 (patch) | |
| tree | 026efa2300b2925d9151a9d24da6c7fc6329a271 /src/road_cmd.cpp | |
| parent | 87a68bd80fa8f0c11ef4898e2c5ecbff8a60f7ad (diff) | |
| download | openttd-e9a35fd75dcde4bc262386f11f41e425a12dac11.tar.xz | |
(svn r11749) -Fix (r11352): when a bankrupted company is bought, reset vehicle color mapping so the vehicles use the new owner color
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 90afac8de..015f8c1be 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -201,9 +201,8 @@ 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)); @@ -236,11 +235,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 (flags & DC_EXEC) { - if (rt == ROADTYPE_ROAD) { - ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); - } + if (rt == ROADTYPE_ROAD) { + ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); + } + if (flags & DC_EXEC) { RoadTypes rts = GetRoadTypes(tile) & ComplementRoadTypes(RoadTypeToRoadTypes(rt)); if (rts == ROADTYPES_NONE) { MakeRailNormal(tile, GetTileOwner(tile), GetCrossingRailBits(tile), GetRailType(tile)); |