mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2091) Small cleanup: uint -> TileIndex, const, don't call FindLandscapeHeightByTile()

This commit is contained in:
tron 2005-03-27 16:40:01 +00:00
parent 31c36d3dd4
commit c4133f2535
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tunnelbridge_cmd.c
View File

@ -1498,23 +1498,16 @@ static uint32 VehicleEnter_TunnelBridge(Vehicle *v, uint tile, int x, int y)
return 0;
}
uint GetVehicleOutOfTunnelTile(Vehicle *v)
TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v)
{
uint tile = v->tile;
int delta_tile;
byte z;
TileIndex tile;
TileIndexDiff delta = (v->direction & 2) ? TILE_XY(0, 1) : TILE_XY(1, 0);
byte z = v->z_pos;
/* locate either ending of the tunnel */
delta_tile = (v->direction&2) ? TILE_XY(0,1) : TILE_XY(1,0);
z = v->z_pos;
for(;;) {
TileInfo ti;
FindLandscapeHeightByTile(&ti, tile);
if (ti.type == MP_TUNNELBRIDGE && (ti.map5 & 0xF0)==0 && (byte)ti.z == z)
for (tile = v->tile;; tile += delta) {
if (IsTileType(tile, MP_TUNNELBRIDGE) && (_map5[tile] & 0xF0) == 0 &&
GetTileZ(tile) == z)
break;
tile += delta_tile;
}
return tile;
}

2
vehicle.h
View File

@ -282,7 +282,7 @@ uint32 VehicleEnterTile(Vehicle *v, uint tile, int x, int y);
void VehicleInTheWayErrMsg(Vehicle *v);
Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z);
uint GetVehicleOutOfTunnelTile(Vehicle *v);
TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v);
bool UpdateSignalsOnSegment(uint tile, byte direction);
void SetSignalsOnBothDir(uint tile, byte track);