summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-04-12 19:05:31 +0000
committertron <tron@openttd.org>2006-04-12 19:05:31 +0000
commitc26601eabd3fdec8d6a32c4b8d3f0c1c6b26223e (patch)
tree4598737bfe265433fbb8ff549af6e739e2aac1e4
parent0a9d5f051f5da5aa6f7bbe67e9f3012ad6413b30 (diff)
downloadopenttd-c26601eabd3fdec8d6a32c4b8d3f0c1c6b26223e.tar.xz
(svn r4402) Fix a faulty entry in the table for slopes under bridges, remove a now unnecessary test which hid the faulty entry till now and undo r4398 (don't do this!)
-rw-r--r--tunnelbridge_cmd.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 0059b5f5b..8d7768919 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -811,8 +811,8 @@ uint GetBridgeHeight(TileIndex t)
static const byte _bridge_foundations[2][16] = {
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
- {1,16,18,3,20,5,0,7,22,0,10,11,12,13,14},
- {1,15,17,0,19,5,6,7,21,9,10,11, 0,13,14},
+ {0,16,18,3,20,5,0,7,22,0,10,11,12,13,14},
+ {0,15,17,0,19,5,6,7,21,9,10,11, 0,13,14},
};
extern const byte _road_sloped_sprites[14];
@@ -986,11 +986,9 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
int x,y;
if (IsTransportUnderBridge(ti->tile)) {
- // draw foundation?
- if (ti->tileh) {
- int f = _bridge_foundations[axis][ti->tileh];
- if (f) DrawFoundation(ti, f);
- }
+ uint f = _bridge_foundations[axis][ti->tileh];
+
+ if (f != 0) DrawFoundation(ti, f);
if (GetTransportTypeUnderBridge(ti->tile) == TRANSPORT_RAIL) {
const RailtypeInfo* rti = GetRailTypeInfo(GetRailType(ti->tile));
@@ -1123,7 +1121,6 @@ static uint GetSlopeZ_TunnelBridge(const TileInfo* ti)
uint f = _bridge_foundations[GetBridgeAxis(tile)][tileh];
if (f != 0) {
- if (f == 1) return z;
if (f < 15) return z + 8;
tileh = _inclined_tileh[f - 15];
}