(svn r5923) Fix 'make depend' which was broken in r3574 (it just did nothing)

This commit is contained in:
tron
2006-08-16 06:05:44 +00:00
parent a0b4a29a57
commit fa5564db13
3 changed files with 27 additions and 24 deletions

View File

@@ -4,6 +4,7 @@
#include "openttd.h"
#include "tile.h"
#include "tunnel_map.h"
#include "vehicle.h"
TileIndex GetOtherTunnelEnd(TileIndex tile)
{
@@ -24,6 +25,31 @@ TileIndex GetOtherTunnelEnd(TileIndex tile)
}
/** Retrieve the exit-tile of the vehicle from inside a tunnel
* Very similar to GetOtherTunnelEnd(), but we use the vehicle's
* direction for determining which end of the tunnel to find
* @param v the vehicle which is inside the tunnel and needs an exit
* @return the exit-tile of the tunnel based on the vehicle's direction */
TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v)
{
TileIndex tile = TileVirtXY(v->x_pos, v->y_pos);
DiagDirection dir = DirToDiagDir(v->direction);
TileIndexDiff delta = TileOffsByDir(dir);
uint z = v->z_pos;
dir = ReverseDiagDir(dir);
while (
!IsTunnelTile(tile) ||
GetTunnelDirection(tile) != dir ||
GetTileZ(tile) != z
) {
tile += delta;
}
return tile;
}
static bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir)
{
TileIndexDiff delta = TileOffsByDir(dir);