summaryrefslogtreecommitdiff
path: root/src/elrail.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-08-09 07:10:42 +0000
committerfrosch <frosch@openttd.org>2010-08-09 07:10:42 +0000
commit48c5091a7c39739e48d06ec365af4f7c713dd25a (patch)
treefae43b0772a1cf96b2684adcedc42f8f4d19e34e /src/elrail.cpp
parent67c21f7e01b7f83c77e934c4fe0771324853d2ab (diff)
downloadopenttd-48c5091a7c39739e48d06ec365af4f7c713dd25a.tar.xz
(svn r20420) -Codechange: Add TileContext enum instead of using a bool.
Diffstat (limited to 'src/elrail.cpp')
-rw-r--r--src/elrail.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp
index 409964460..3a2ca3d94 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -166,20 +166,20 @@ static TrackBits MaskWireBits(TileIndex t, TrackBits tracks)
/**
* Get the base wire sprite to use.
*/
-static inline SpriteID GetWireBase(TileIndex tile, bool upper_halftile = false)
+static inline SpriteID GetWireBase(TileIndex tile, TileContext context = TC_NORMAL)
{
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
- SpriteID wires = GetCustomRailSprite(rti, tile, RTSG_WIRES, upper_halftile);
+ SpriteID wires = GetCustomRailSprite(rti, tile, RTSG_WIRES, context);
return wires == 0 ? SPR_WIRE_BASE : wires;
}
/**
* Get the base pylon sprite to use.
*/
-static inline SpriteID GetPylonBase(TileIndex tile, bool upper_halftile = false)
+static inline SpriteID GetPylonBase(TileIndex tile, TileContext context = TC_NORMAL)
{
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
- SpriteID pylons = GetCustomRailSprite(rti, tile, RTSG_PYLONS, upper_halftile);
+ SpriteID pylons = GetCustomRailSprite(rti, tile, RTSG_PYLONS, context);
return pylons == 0 ? SPR_PYLON_BASE : pylons;
}
@@ -303,7 +303,7 @@ static void DrawCatenaryRailway(const TileInfo *ti)
AdjustTileh(ti->tile, &tileh[TS_HOME]);
SpriteID pylon_normal = GetPylonBase(ti->tile);
- SpriteID pylon_halftile = (halftile_corner != CORNER_INVALID) ? GetPylonBase(ti->tile, true) : pylon_normal;
+ SpriteID pylon_halftile = (halftile_corner != CORNER_INVALID) ? GetPylonBase(ti->tile, TC_UPPER_HALFTILE) : pylon_normal;
for (DiagDirection i = DIAGDIR_BEGIN; i < DIAGDIR_END; i++) {
static const uint edge_corners[] = {
@@ -442,7 +442,7 @@ static void DrawCatenaryRailway(const TileInfo *ti)
}
SpriteID wire_normal = GetWireBase(ti->tile);
- SpriteID wire_halftile = (halftile_corner != CORNER_INVALID) ? GetWireBase(ti->tile, true) : wire_normal;
+ SpriteID wire_halftile = (halftile_corner != CORNER_INVALID) ? GetWireBase(ti->tile, TC_UPPER_HALFTILE) : wire_normal;
Track halftile_track;
switch (halftile_corner) {
case CORNER_W: halftile_track = TRACK_LEFT; break;