Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tron 2006-08-16 06:05:44 +00:00
parent f4762cdae4
commit ced2b50c05
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1037,7 +1037,7 @@ depend:
@true # The include handles this automagically
# Introduce the dependencies
ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper upgradeconf unittest $(MAKE_CONFIG)),)
ifeq ($(findstring $(MAKECMDGOALS), clean info mrproper upgradeconf unittest $(MAKE_CONFIG)),)
-include $(DEPS)
endif

26
tunnel_map.c
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);

23
tunnelbridge_cmd.c
View File

@ -1425,29 +1425,6 @@ static uint32 VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y
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 = {
DrawTile_TunnelBridge, /* draw_tile_proc */