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

(svn r13016) -Codechange: unify the detection if rail catenary should be drawn

Browse Source
This commit is contained in:
smatz
2008-05-08 16:48:29 +00:00
parent 4a11ebe76f
commit 386a3f1d20
13 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/elrail.cpp
View File

@@ -67,6 +67,7 @@
#include "player_base.h"
#include "tunnelbridge.h"
#include "engine_func.h"
#include "elrail_func.h"
#include "engine_base.h"
#include "table/sprites.h"
@@ -182,8 +183,6 @@ void DrawCatenaryOnTunnel(const TileInfo *ti)
{ 1, 0, 15, 16 }, // NW
};
if (!HasCatenary(GetRailType(ti->tile)) || _patches.disable_elrails) return;
DiagDirection dir = GetTunnelBridgeDirection(ti->tile);
const SortableSpriteStruct *sss = &CatenarySpriteData_Tunnel[dir];
@@ -382,11 +381,6 @@ static void DrawCatenaryRailway(const TileInfo *ti)
void DrawCatenaryOnBridge(const TileInfo *ti)
{
if (_patches.disable_elrails) return;
/* Do not draw catenary if it is invisible */
if (IsInvisibilitySet(TO_CATENARY)) return;
TileIndex end = GetSouthernBridgeEnd(ti->tile);
TileIndex start = GetOtherBridgeEnd(end);
@@ -440,11 +434,6 @@ void DrawCatenaryOnBridge(const TileInfo *ti)
void DrawCatenary(const TileInfo *ti)
{
if (_patches.disable_elrails) return;
/* Do not draw catenary if it is invisible */
if (IsInvisibilitySet(TO_CATENARY)) return;
switch (GetTileType(ti->tile)) {
case MP_RAILWAY:
if (IsRailDepot(ti->tile)) {