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

Merge branch 'save_ext' into signal_tunnels_bridges

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-12-28 15:06:08 +00:00
parent 556594f2f0 56f173e15e
commit 074555e41d
137 changed files with 2728 additions and 2037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tunnelbridge_cmd.cpp
View File

@@ -1347,14 +1347,14 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
}
}
if (HasCatenaryDrawn(GetRailType(ti->tile))) {
if (HasRailCatenaryDrawn(GetRailType(ti->tile))) {
/* Maybe draw pylons on the entry side */
DrawCatenary(ti);
DrawRailCatenary(ti);
catenary = true;
StartSpriteCombine();
/* Draw wire above the ramp */
DrawCatenaryOnTunnel(ti);
DrawRailCatenaryOnTunnel(ti);
}
}
@@ -1475,8 +1475,8 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
}
EndSpriteCombine();
if (HasCatenaryDrawn(GetRailType(ti->tile))) {
DrawCatenary(ti);
if (HasRailCatenaryDrawn(GetRailType(ti->tile))) {
DrawRailCatenary(ti);
}
}
@@ -1529,7 +1529,7 @@ void DrawBridgeMiddle(const TileInfo *ti)
{
/* Sectional view of bridge bounding boxes:
*
* 1 2 1,2 = SpriteCombine of Bridge front/(back&floor) and TramCatenary
* 1 2 1,2 = SpriteCombine of Bridge front/(back&floor) and RoadCatenary
* 1 2 3 = empty helper BB
* 1 7 2 4,5 = pillars under higher bridges
* 1 6 88888 6 2 6 = elrail-pylons
@@ -1629,8 +1629,8 @@ void DrawBridgeMiddle(const TileInfo *ti)
EndSpriteCombine();
if (HasCatenaryDrawn(GetRailType(rampsouth))) {
DrawCatenaryOnBridge(ti);
if (HasRailCatenaryDrawn(GetRailType(rampsouth))) {
DrawRailCatenaryOnBridge(ti);
}
if (IsTunnelBridgeWithSignalSimulation(rampsouth)) {
IsTunnelBridgeSignalSimulationExit(rampsouth) ? DrawBrigeSignalOnMiddlePart(ti, rampnorth, z): DrawBrigeSignalOnMiddlePart(ti, rampsouth, z);
@@ -1753,6 +1753,7 @@ static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
if (tt == TRANSPORT_RAIL) {
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
td->rail_speed = rti->max_speed;
td->railtype = rti->strings.name;
if (!IsTunnel(tile)) {
uint16 spd = GetBridgeSpec(GetBridgeType(tile))->speed;