mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r3901) Remove the last user of FindEdgesOfBridge() by using functions with similar functionality

release/0.5
tron 2006-03-16 06:38:51 +00:00
parent fedebdd09b
commit efb64283df
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tunnelbridge_cmd.c
View File

@ -596,31 +596,6 @@ static int32 DoClearTunnel(TileIndex tile, uint32 flags)
return _price.clear_tunnel * (length + 1); return _price.clear_tunnel * (length + 1);
} }
static TileIndex FindEdgesOfBridge(TileIndex tile, TileIndex *endtile)
{
Axis direction = GB(_m[tile].m5, 0, 1);
TileIndex start;
// find start of bridge
for (;;) {
if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5 & 0xE0) == 0x80)
break;
tile += (direction == AXIS_X ? TileDiffXY(-1, 0) : TileDiffXY(0, -1));
}
start = tile;
// find end of bridge
for (;;) {
if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5 & 0xE0) == 0xA0)
break;
tile += (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
}
*endtile = tile;
return start;
}
static int32 DoClearBridge(TileIndex tile, uint32 flags) static int32 DoClearBridge(TileIndex tile, uint32 flags)
{ {
@ -664,9 +639,9 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags)
} }
return _price.clear_water; return _price.clear_water;
} }
}
tile = FindEdgesOfBridge(tile, &endtile); tile = GetSouthernBridgeEnd(tile);
}
// floods, scenario editor can always destroy bridges // floods, scenario editor can always destroy bridges
if (_current_player != OWNER_WATER && _game_mode != GM_EDITOR && !CheckTileOwnership(tile)) { if (_current_player != OWNER_WATER && _game_mode != GM_EDITOR && !CheckTileOwnership(tile)) {
@ -674,6 +649,8 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags)
return CMD_ERROR; return CMD_ERROR;
} }
endtile = GetOtherBridgeEnd(tile);
if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) return CMD_ERROR; if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) return CMD_ERROR;
direction = GetBridgeRampDirection(tile); direction = GetBridgeRampDirection(tile);