(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
This commit is contained in:
@@ -1216,14 +1216,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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1341,8 +1341,8 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
|
||||
}
|
||||
|
||||
EndSpriteCombine();
|
||||
if (HasCatenaryDrawn(GetRailType(ti->tile))) {
|
||||
DrawCatenary(ti);
|
||||
if (HasRailCatenaryDrawn(GetRailType(ti->tile))) {
|
||||
DrawRailCatenary(ti);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1392,7 +1392,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
|
||||
@@ -1491,8 +1491,8 @@ void DrawBridgeMiddle(const TileInfo *ti)
|
||||
|
||||
EndSpriteCombine();
|
||||
|
||||
if (HasCatenaryDrawn(GetRailType(rampsouth))) {
|
||||
DrawCatenaryOnBridge(ti);
|
||||
if (HasRailCatenaryDrawn(GetRailType(rampsouth))) {
|
||||
DrawRailCatenaryOnBridge(ti);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user