cpp/openttd-patchpack/source Changeset - r6814:46f66dcbc291

Changeset - r6814:46f66dcbc291

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2007-06-07 08:58:21
rubidium@openttd.org

(svn r10053) -Fix: could not clear a level-crossing tile with tram tracks.

1 file changed with 17 insertions and 4 deletions:

src/road_cmd.cpp

0 comments (0 inline, 0 general)

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -96,12 +96,17 @@ static bool CheckAllowRemoveRoad(TileInd @@
 /** Delete a piece of road.
  * @param tile tile where to remove road from
  * @param flags operation to perform
  * @param p1 bit 0..3 road pieces to remove (RoadBits)
  *           bit 4..5 road type
  *           bit    6 ignore the fact that the tram track has not been removed
  *                    yet when removing the road bits when not actually doing
  *                    it. Makes it possible to test whether the road bits can
  *                    be removed from a level crossing without physically
  *                    removing the tram bits before the test.
  * @param p2 unused
  */
 int32 CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	/* cost for removing inner/edge -roads */
 	static const uint16 road_remove_cost[2] = {50, 18};
@@ @@ -233,13 +238,13 @@ int32 CmdRemoveRoad(TileIndex tile, uint @@
 			if (pieces & ComplementRoadBits(GetCrossingRoadBits(tile))) {
 				return CMD_ERROR;
+			}
 			/* Don't allow road to be removed from the crossing when there is tram;
 			 * we can't draw the crossing without trambits ;) */
 			if (rt == ROADTYPE_ROAD && HASBIT(GetRoadTypes(tile), ROADTYPE_TRAM)) return CMD_ERROR;
+			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);
+				}
@@ @@ -797,18 +802,26 @@ static int32 ClearTile_Road(TileIndex ti @@
+			}
 			return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
+		}
 #undef M
 		case ROAD_TILE_CROSSING: {
 			int32 ret;
 			RoadTypes rts = GetRoadTypes(tile);
 			int32 ret = 0;
 			if (flags & DC_AUTO) return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
 			ret = DoCommand(tile, GetCrossingRoadBits(tile), 0, flags, CMD_REMOVE_ROAD);
 			if (CmdFailed(ret)) return CMD_ERROR;
 			/* Must iterate over the roadtypes in a reverse manner because
 			 * tram tracks must be removed before the road bits. */
 			for (RoadType rt = ROADTYPE_HWAY; rt >= ROADTYPE_ROAD; rt--) {
 				if (HASBIT(rts, rt)) {
 					int32 tmp_ret = DoCommand(tile, 1 << 6 | rt << 4 | GetCrossingRoadBits(tile), 0, flags, CMD_REMOVE_ROAD);
 					if (CmdFailed(tmp_ret)) return tmp_ret;
 					ret += tmp_ret;
+				}
+			}
 			if (flags & DC_EXEC) {
 				DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
+			}
 			return ret;
+		}

0 comments (0 inline, 0 general)