mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9077) -Fix [FS#612]: the wrong catenary wires were drawn for tunnel entrances.

release/0.6
rubidium 2007-03-09 14:41:39 +00:00
parent d609dff2ba
commit 2e1bda2c1a
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elrail.cpp
View File

@ -125,7 +125,7 @@ static void AdjustTileh(TileIndex tile, Slope *tileh)
{ {
if (IsTileType(tile, MP_TUNNELBRIDGE)) { if (IsTileType(tile, MP_TUNNELBRIDGE)) {
if (IsTunnel(tile)) { if (IsTunnel(tile)) {
*tileh = SLOPE_FLAT; *tileh = SLOPE_STEEP; /* XXX - Hack to make tunnel entrances to always have a pylon */
} else { } else {
if (*tileh != SLOPE_FLAT) { if (*tileh != SLOPE_FLAT) {
*tileh = SLOPE_FLAT; *tileh = SLOPE_FLAT;
@ -291,7 +291,16 @@ static void DrawCatenaryRailway(const TileInfo *ti)
/* Drawing of pylons is finished, now draw the wires */ /* Drawing of pylons is finished, now draw the wires */
for (t = TRACK_BEGIN; t < TRACK_END; t++) { for (t = TRACK_BEGIN; t < TRACK_END; t++) {
if (HASBIT(trackconfig[TS_HOME], t)) { if (HASBIT(trackconfig[TS_HOME], t)) {
if (IsTunnelTile(ti->tile)) {
const SortableSpriteStruct* sss = &CatenarySpriteData_Tunnel[GetTunnelDirection(ti->tile)];
AddSortableSpriteToDraw(
sss->image, PAL_NONE, ti->x + sss->x_offset, ti->y + sss->y_offset,
sss->x_size, sss->y_size, sss->z_size,
GetTileZ(ti->tile) + sss->z_offset
);
break;
}
byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) + byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
(HASBIT(PCPstatus, PCPpositions[t][1]) << 1); (HASBIT(PCPstatus, PCPpositions[t][1]) << 1);
@ -371,7 +380,7 @@ void DrawCatenary(const TileInfo *ti)
switch (GetTileType(ti->tile)) { switch (GetTileType(ti->tile)) {
case MP_RAILWAY: case MP_RAILWAY:
if (IsRailDepot(ti->tile)) { if ( IsRailDepot(ti->tile)) {
const SortableSpriteStruct* sss = &CatenarySpriteData_Depot[GetRailDepotDirection(ti->tile)]; const SortableSpriteStruct* sss = &CatenarySpriteData_Depot[GetRailDepotDirection(ti->tile)];
AddSortableSpriteToDraw( AddSortableSpriteToDraw(

8
src/table/elrail_data.h
View File

@ -340,6 +340,14 @@ static const SortableSpriteStruct CatenarySpriteData_Depot[] = {
{ SPR_WIRE_DEPOT_NW, 8, 0, 1, 8, 1, ELRAIL_ELEVATION } //! Wire for NW depot exit { SPR_WIRE_DEPOT_NW, 8, 0, 1, 8, 1, ELRAIL_ELEVATION } //! Wire for NW depot exit
}; };
static const SortableSpriteStruct CatenarySpriteData_Tunnel[] = {
{ SPR_WIRE_TUNNEL_NE, 0, 8, 8, 1, 1, ELRAIL_ELEVATION }, //! Wire for NE tunnel exit
{ SPR_WIRE_TUNNEL_SE, 8, 0, 1, 8, 1, ELRAIL_ELEVATION }, //! Wire for SE tunnel exit
{ SPR_WIRE_TUNNEL_SW, 0, 8, 8, 1, 1, ELRAIL_ELEVATION }, //! Wire for SW tunnel exit
{ SPR_WIRE_TUNNEL_NW, 8, 0, 1, 8, 1, ELRAIL_ELEVATION } //! Wire for NW tunnel exit
};
/** Refers to a certain element of the catenary. /** Refers to a certain element of the catenary.
* Identifiers for Wires: * Identifiers for Wires:
* <ol><li>Direction of the wire</li> * <ol><li>Direction of the wire</li>

6
src/table/sprites.h
View File

@ -291,6 +291,12 @@ enum Sprites {
SPR_WIRE_Y_NW_DOWN = SPR_ELRAIL_BASE + 26, SPR_WIRE_Y_NW_DOWN = SPR_ELRAIL_BASE + 26,
/* Tunnel entries */ /* Tunnel entries */
SPR_WIRE_TUNNEL_NE = SPR_ELRAIL_BASE + 27,
SPR_WIRE_TUNNEL_SE = SPR_ELRAIL_BASE + 28,
SPR_WIRE_TUNNEL_SW = SPR_ELRAIL_BASE + 29,
SPR_WIRE_TUNNEL_NW = SPR_ELRAIL_BASE + 30,
/* Depot entries */
SPR_WIRE_DEPOT_SW = SPR_ELRAIL_BASE + 27, SPR_WIRE_DEPOT_SW = SPR_ELRAIL_BASE + 27,
SPR_WIRE_DEPOT_NW = SPR_ELRAIL_BASE + 28, SPR_WIRE_DEPOT_NW = SPR_ELRAIL_BASE + 28,
SPR_WIRE_DEPOT_NE = SPR_ELRAIL_BASE + 29, SPR_WIRE_DEPOT_NE = SPR_ELRAIL_BASE + 29,