|
|
@ -125,7 +125,7 @@ static void AdjustTileh(TileIndex tile, Slope *tileh)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
|
|
|
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
|
|
|
if (IsTunnel(tile)) {
|
|
|
|
if (IsTunnel(tile)) {
|
|
|
|
*tileh = SLOPE_FLAT;
|
|
|
|
*tileh = SLOPE_STEEP; /* XXX - Hack to make tunnel entrances to always have a pylon */
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if (*tileh != SLOPE_FLAT) {
|
|
|
|
if (*tileh != SLOPE_FLAT) {
|
|
|
|
*tileh = SLOPE_FLAT;
|
|
|
|
*tileh = SLOPE_FLAT;
|
|
|
@ -291,7 +291,16 @@ static void DrawCatenaryRailway(const TileInfo *ti)
|
|
|
|
/* Drawing of pylons is finished, now draw the wires */
|
|
|
|
/* Drawing of pylons is finished, now draw the wires */
|
|
|
|
for (t = TRACK_BEGIN; t < TRACK_END; t++) {
|
|
|
|
for (t = TRACK_BEGIN; t < TRACK_END; t++) {
|
|
|
|
if (HASBIT(trackconfig[TS_HOME], t)) {
|
|
|
|
if (HASBIT(trackconfig[TS_HOME], t)) {
|
|
|
|
|
|
|
|
if (IsTunnelTile(ti->tile)) {
|
|
|
|
|
|
|
|
const SortableSpriteStruct* sss = &CatenarySpriteData_Tunnel[GetTunnelDirection(ti->tile)];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AddSortableSpriteToDraw(
|
|
|
|
|
|
|
|
sss->image, PAL_NONE, ti->x + sss->x_offset, ti->y + sss->y_offset,
|
|
|
|
|
|
|
|
sss->x_size, sss->y_size, sss->z_size,
|
|
|
|
|
|
|
|
GetTileZ(ti->tile) + sss->z_offset
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
|
|
|
|
byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
|
|
|
|
(HASBIT(PCPstatus, PCPpositions[t][1]) << 1);
|
|
|
|
(HASBIT(PCPstatus, PCPpositions[t][1]) << 1);
|
|
|
|
|
|
|
|
|
|
|
|