gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-07 06:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3885) Simplify DoConvertTunnelBridgeRail() a bit

Browse Source
This commit is contained in:
tron 2006-03-15 16:09:23 +00:00
parent a19cdf6040
commit 962852b732
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tunnelbridge_cmd.c
View File

@ -800,7 +800,7 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, uint totype, bool exec)
} }
return _price.build_rail >> 1; return _price.build_rail >> 1;
} else if ((_m[tile].m5 & 0xC6) == 0x80) { } else if ((_m[tile].m5 & 0xC6) == 0x80) {
TileIndex starttile; TileIndexDiff delta;
int32 cost; int32 cost;
uint z = TilePixelHeight(tile); uint z = TilePixelHeight(tile);
@ -809,7 +809,7 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, uint totype, bool exec)
if (!CheckTileOwnership(tile)) return CMD_ERROR; if (!CheckTileOwnership(tile)) return CMD_ERROR;
// railway bridge // railway bridge
starttile = tile = FindEdgesOfBridge(tile, &endtile); tile = FindEdgesOfBridge(tile, &endtile);
// Make sure there's no vehicle on the bridge // Make sure there's no vehicle on the bridge
v = FindVehicleBetween(tile, endtile, z); v = FindVehicleBetween(tile, endtile, z);
if (v != NULL) { if (v != NULL) {
@ -817,25 +817,24 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, uint totype, bool exec)
return CMD_ERROR; return CMD_ERROR;
} }
if (!EnsureNoVehicle(starttile) || !EnsureNoVehicle(endtile)) { if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) {
_error_message = STR_8803_TRAIN_IN_THE_WAY; _error_message = STR_8803_TRAIN_IN_THE_WAY;
return CMD_ERROR; return CMD_ERROR;
} }
if (GB(_m[tile].m3, 0, 4) == totype) return CMD_ERROR; if (GB(_m[tile].m3, 0, 4) == totype) return CMD_ERROR;
cost = 0;
do {
if (exec) {
if (tile == starttile || tile == endtile) {
SB(_m[tile].m3, 0, 4, totype); SB(_m[tile].m3, 0, 4, totype);
} else { SB(_m[endtile].m3, 0, 4, totype);
cost = 2 * (_price.build_rail >> 1);
delta = TileOffsByDir(GetBridgeRampDirection(tile));
for (tile += delta; tile != endtile; tile += delta) {
if (exec) {
SB(_m[tile].m3, 4, 4, totype); SB(_m[tile].m3, 4, 4, totype);
}
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
cost += _price.build_rail >> 1; cost += _price.build_rail >> 1;
tile += GB(_m[tile].m5, 0, 1) ? TileDiffXY(0, 1) : TileDiffXY(1, 0); }
} while (tile <= endtile);
return cost; return cost;
} else } else