diff options
author | tron <tron@openttd.org> | 2006-06-07 19:35:21 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2006-06-07 19:35:21 +0000 |
commit | be88e269b918b365695e84cfa962e8d21b98e759 (patch) | |
tree | 5a6fb4aa93546ad194301d231de10ba5370ccc6f /bridge_map.c | |
parent | ace071529e2116f92aeec50d3bac0f95953b129b (diff) | |
download | openttd-be88e269b918b365695e84cfa962e8d21b98e759.tar.xz |
(svn r5155) - Remove the bridge branch merge (revision r5070)
Diffstat (limited to 'bridge_map.c')
-rw-r--r-- | bridge_map.c | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/bridge_map.c b/bridge_map.c index e21c5928c..cbb955c37 100644 --- a/bridge_map.c +++ b/bridge_map.c @@ -3,22 +3,19 @@ #include "stdafx.h" #include "openttd.h" #include "bridge_map.h" -#include "variables.h" TileIndex GetBridgeEnd(TileIndex tile, DiagDirection dir) { TileIndexDiff delta = TileOffsByDir(dir); - do { tile += delta; } while (IsBridgeAbove(tile) && IsBridgeOfAxis(tile, DiagDirToAxis(dir))); - - return tile; -} + assert(DiagDirToAxis(dir) == GetBridgeAxis(tile)); + do { + tile += delta; + } while (!IsBridgeRamp(tile)); -TileIndex GetNorthernBridgeEnd(TileIndex t) -{ - return GetBridgeEnd(t, ReverseDiagDir(AxisToDiagDir(GetBridgeAxis(t)))); + return tile; } @@ -30,25 +27,11 @@ TileIndex GetSouthernBridgeEnd(TileIndex t) TileIndex GetOtherBridgeEnd(TileIndex tile) { - assert(IsBridgeTile(tile)); - return GetBridgeEnd(tile, GetBridgeRampDirection(tile)); -} - -uint GetBridgeHeight(TileIndex tile, Axis a) -{ - uint h, f; - uint tileh = GetTileSlope(tile, &h); + TileIndexDiff delta = TileOffsByDir(GetBridgeRampDirection(tile)); - f = GetBridgeFoundation(tileh, a); + do { + tile += delta; + } while (!IsBridgeRamp(tile)); - if (f) { - if (f < 15) { - h += TILE_HEIGHT; - tileh = SLOPE_FLAT; - } else { - tileh = _inclined_tileh[f - 15]; - } - } - - return h + TILE_HEIGHT; + return tile; } |