mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r5924) Revert accidently commited files
This commit is contained in:
parent
fa5564db13
commit
3f35ae1501
26
tunnel_map.c
26
tunnel_map.c
|
@ -4,7 +4,6 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "tile.h"
|
#include "tile.h"
|
||||||
#include "tunnel_map.h"
|
#include "tunnel_map.h"
|
||||||
#include "vehicle.h"
|
|
||||||
|
|
||||||
TileIndex GetOtherTunnelEnd(TileIndex tile)
|
TileIndex GetOtherTunnelEnd(TileIndex tile)
|
||||||
{
|
{
|
||||||
|
@ -25,31 +24,6 @@ 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)
|
static bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir)
|
||||||
{
|
{
|
||||||
TileIndexDiff delta = TileOffsByDir(dir);
|
TileIndexDiff delta = TileOffsByDir(dir);
|
||||||
|
|
|
@ -1425,6 +1425,29 @@ static uint32 VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 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 = v->tile;
|
||||||
|
DiagDirection dir = DirToDiagDir(v->direction);
|
||||||
|
TileIndexDiff delta = TileOffsByDir(dir);
|
||||||
|
byte z = v->z_pos;
|
||||||
|
|
||||||
|
dir = ReverseDiagDir(dir);
|
||||||
|
while (
|
||||||
|
!IsTunnelTile(tile) ||
|
||||||
|
GetTunnelDirection(tile) != dir ||
|
||||||
|
GetTileZ(tile) != z
|
||||||
|
) {
|
||||||
|
tile += delta;
|
||||||
|
}
|
||||||
|
|
||||||
|
return tile;
|
||||||
|
}
|
||||||
|
|
||||||
const TileTypeProcs _tile_type_tunnelbridge_procs = {
|
const TileTypeProcs _tile_type_tunnelbridge_procs = {
|
||||||
DrawTile_TunnelBridge, /* draw_tile_proc */
|
DrawTile_TunnelBridge, /* draw_tile_proc */
|
||||||
|
|
Loading…
Reference in New Issue