cpp/openttd-patchpack/source Changeset - r16738:d08e218e816c

Changeset - r16738:d08e218e816c

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 14 years ago 2010-12-12 17:21:49
rubidium@openttd.org

(svn r21481) -Codechange: make rail conversion make use of TILE_AREA_LOOP as well

1 file changed with 4 insertions and 15 deletions:

src/rail_cmd.cpp

0 comments (0 inline, 0 general)

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -1394,28 +1394,18 @@ CommandCost CmdConvertRail(TileIndex til @@
+{
 	RailType totype = Extract<RailType, 0, 4>(p2);
 	if (!ValParamRailtype(totype)) return CMD_ERROR;
 	if (p1 >= MapSize()) return CMD_ERROR;
 	uint ex = TileX(tile);
 	uint ey = TileY(tile);
 	uint sx = TileX(p1);
 	uint sy = TileY(p1);
 	/* make sure sx,sy are smaller than ex,ey */
 	if (ex < sx) Swap(ex, sx);
 	if (ey < sy) Swap(ey, sy);
 	TrainList affected_trains;
 	CommandCost cost(EXPENSES_CONSTRUCTION);
 	CommandCost error = CommandCost(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK); // by default, there is no track to convert.
 	for (uint x = sx; x <= ex; ++x) {
 		for (uint y = sy; y <= ey; ++y) {
 			TileIndex tile = TileXY(x, y);
 	TileArea ta(tile, p1);
 	TILE_AREA_LOOP(tile, ta) {
 			TileType tt = GetTileType(tile);
 			/* Check if there is any track on tile */
 			switch (tt) {
 				case MP_RAILWAY:
 					break;
@@ @@ -1509,14 +1499,14 @@ CommandCost CmdConvertRail(TileIndex til @@
 				case MP_TUNNELBRIDGE: {
 					TileIndex endtile = GetOtherTunnelBridgeEnd(tile);
 					/* If both ends of tunnel/bridge are in the range, do not try to convert twice -
 					 * it would cause assert because of different test and exec runs */
 					if (endtile < tile && TileX(endtile) >= sx && TileX(endtile) <= ex &&
 							TileY(endtile) >= sy && TileY(endtile) <= ey) continue;
 				if (endtile < tile && TileX(endtile) >= TileX(ta.tile) && TileX(endtile) < TileX(ta.tile) + ta.w &&
 						TileY(endtile) >= TileY(ta.tile) && TileY(endtile) < TileY(ta.tile) + ta.h) continue;
 					/* When not coverting rail <-> el. rail, any vehicle cannot be in tunnel/bridge */
 					if (!IsCompatibleRail(GetRailType(tile), totype)) {
 						CommandCost ret = TunnelBridgeIsFree(tile, endtile);
 						if (ret.Failed()) {
 							error = ret;
@@ @@ -1568,13 +1558,12 @@ CommandCost CmdConvertRail(TileIndex til @@
+			}
 			for (uint i = 0; i < vehicles_affected.Length(); ++i) {
 				TryPathReserve(vehicles_affected[i], true);
+			}
+		}
+	}
 	if (flags & DC_EXEC) {
 		/* Railtype changed, update trains as when entering different track */
 		for (Train **v = affected_trains.Begin(); v != affected_trains.End(); v++) {
 			(*v)->RailtypeChanged();
+		}

0 comments (0 inline, 0 general)