|
@@ -36,12 +36,13 @@
|
|
|
#include "player_base.h"
|
|
|
#include "engine_func.h"
|
|
|
#include "engine_base.h"
|
|
|
#include "economy_func.h"
|
|
|
#include "rail.h"
|
|
|
#include "cheat_func.h"
|
|
|
#include "elrail_func.h"
|
|
|
#include "landscape_type.h"
|
|
|
|
|
|
#include "table/sprites.h"
|
|
|
#include "table/strings.h"
|
|
|
#include "table/bridge_land.h"
|
|
|
|
|
@@ -884,13 +885,13 @@ static void DrawTile_TunnelBridge(TileIn
|
|
|
if (!IsInvisibilitySet(TO_CATENARY)) {
|
|
|
catenary = true;
|
|
|
StartSpriteCombine();
|
|
|
AddSortableSpriteToDraw(SPR_TRAMWAY_TUNNEL_WIRES + tunnelbridge_direction, PAL_NONE, ti->x, ti->y, BB_data[10], BB_data[11], TILE_HEIGHT, ti->z, IsTransparencySet(TO_CATENARY), BB_data[8], BB_data[9], BB_Z_SEPARATOR);
|
|
|
}
|
|
|
}
|
|
|
} else if (!IsInvisibilitySet(TO_CATENARY) && HasCatenary(GetRailType(ti->tile))) {
|
|
|
} else if (HasCatenaryDrawn(GetRailType(ti->tile))) {
|
|
|
catenary = true;
|
|
|
StartSpriteCombine();
|
|
|
DrawCatenaryOnTunnel(ti);
|
|
|
}
|
|
|
|
|
|
AddSortableSpriteToDraw(image + 1, PAL_NONE, ti->x + TILE_SIZE - 1, ti->y + TILE_SIZE - 1, BB_data[0], BB_data[1], TILE_HEIGHT, ti->z, false, BB_data[2], BB_data[3], BB_Z_SEPARATOR);
|
|
@@ -957,13 +958,13 @@ static void DrawTile_TunnelBridge(TileIn
|
|
|
offset += 2;
|
|
|
}
|
|
|
/* DrawBridgeTramBits() calls EndSpriteCombine() and StartSpriteCombine() */
|
|
|
DrawBridgeTramBits(ti->x, ti->y, z, offset, HasBit(rts, ROADTYPE_ROAD), true);
|
|
|
}
|
|
|
EndSpriteCombine();
|
|
|
} else if (HasCatenary(GetRailType(ti->tile))) {
|
|
|
} else if (HasCatenaryDrawn(GetRailType(ti->tile))) {
|
|
|
DrawCatenary(ti);
|
|
|
}
|
|
|
|
|
|
DrawBridgeMiddle(ti);
|
|
|
}
|
|
|
}
|
|
@@ -1085,13 +1086,13 @@ void DrawBridgeMiddle(const TileInfo* ti
|
|
|
/* DrawBridgeTramBits() calls EndSpriteCombine() and StartSpriteCombine() */
|
|
|
DrawBridgeTramBits(x, y, bridge_z, axis ^ 1, HasBit(rts, ROADTYPE_ROAD), false);
|
|
|
} else {
|
|
|
EndSpriteCombine();
|
|
|
StartSpriteCombine();
|
|
|
}
|
|
|
} else if (HasCatenary(GetRailType(rampsouth))) {
|
|
|
} else if (HasCatenaryDrawn(GetRailType(rampsouth))) {
|
|
|
DrawCatenaryOnBridge(ti);
|
|
|
}
|
|
|
|
|
|
/* draw roof, the component of the bridge which is logically between the vehicle and the camera */
|
|
|
if (!IsInvisibilitySet(TO_BRIDGES)) {
|
|
|
if (axis == AXIS_X) {
|