diff options
| author | frosch <frosch@openttd.org> | 2016-11-05 11:53:03 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2016-11-05 11:53:03 +0000 |
| commit | d9bfe88261b99631322ca348e48027e22fa3c84e (patch) | |
| tree | 2856766a95456025da5b6fcc012f2dec3ed46afd /src/elrail_func.h | |
| parent | 94b3965989f23363a2863da7e819d6e8a8ff1214 (diff) | |
| download | openttd-d9bfe88261b99631322ca348e48027e22fa3c84e.tar.xz | |
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
Diffstat (limited to 'src/elrail_func.h')
| -rw-r--r-- | src/elrail_func.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/elrail_func.h b/src/elrail_func.h index 60cb782bb..5cdae20c5 100644 --- a/src/elrail_func.h +++ b/src/elrail_func.h @@ -20,7 +20,7 @@ * Test if a rail type has catenary * @param rt Rail type to test */ -static inline bool HasCatenary(RailType rt) +static inline bool HasRailCatenary(RailType rt) { return HasBit(GetRailTypeInfo(rt)->flags, RTF_CATENARY); } @@ -29,14 +29,14 @@ static inline bool HasCatenary(RailType rt) * Test if we should draw rail catenary * @param rt Rail type to test */ -static inline bool HasCatenaryDrawn(RailType rt) +static inline bool HasRailCatenaryDrawn(RailType rt) { - return HasCatenary(rt) && !IsInvisibilitySet(TO_CATENARY) && !_settings_game.vehicle.disable_elrails; + return HasRailCatenary(rt) && !IsInvisibilitySet(TO_CATENARY) && !_settings_game.vehicle.disable_elrails; } -void DrawCatenary(const TileInfo *ti); -void DrawCatenaryOnTunnel(const TileInfo *ti); -void DrawCatenaryOnBridge(const TileInfo *ti); +void DrawRailCatenary(const TileInfo *ti); +void DrawRailCatenaryOnTunnel(const TileInfo *ti); +void DrawRailCatenaryOnBridge(const TileInfo *ti); bool SettingsDisableElrail(int32 p1); ///< _settings_game.disable_elrail callback |