dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h

Browse Source
This commit is contained in:
smatz
2007-12-16 15:38:51 +00:00
parent 8ce9c5f29b
commit 926fe5c9e9
28 changed files with 245 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tunnel_map.cpp
View File

@@ -6,6 +6,8 @@
#include "openttd.h"
#include "tile.h"
#include "tunnel_map.h"
#include "tunnelbridge_map.h"
/**
* Gets the other end of the tunnel. Where a vehicle would reappear when it
@@ -15,7 +17,7 @@
*/
TileIndex GetOtherTunnelEnd(TileIndex tile)
{
DiagDirection dir = GetTunnelDirection(tile);
DiagDirection dir = GetTunnelBridgeDirection(tile);
TileIndexDiff delta = TileOffsByDiagDir(dir);
uint z = GetTileZ(tile);
@@ -24,7 +26,7 @@ TileIndex GetOtherTunnelEnd(TileIndex tile)
tile += delta;
} while (
!IsTunnelTile(tile) ||
GetTunnelDirection(tile) != dir ||
GetTunnelBridgeDirection(tile) != dir ||
GetTileZ(tile) != z
);
@@ -52,7 +54,7 @@ bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir)
return
z == height &&
IsTunnelTile(tile) &&
GetTunnelDirection(tile) == dir;
GetTunnelBridgeDirection(tile) == dir;
}
/**