gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3209) In TileLoop_Track(), use names based on function rather than their place in the map array.

Browse Source
This commit is contained in:
peter1138 2005-11-16 14:30:24 +00:00
parent 89cfe202b8
commit b739674307
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rail_cmd.c
View File

@ -1970,23 +1970,23 @@ static void AnimateTile_Track(TileIndex tile)
static void TileLoop_Track(TileIndex tile) static void TileLoop_Track(TileIndex tile)
{ {
byte a2; byte old_ground;
byte rail; byte new_ground;
uint16 m2; TrackBits rail;
m2 = GB(_m[tile].m2, 0, 4); old_ground = GB(_m[tile].m2, 0, 4);
switch (_opt.landscape) { switch (_opt.landscape) {
case LT_HILLY: case LT_HILLY:
if (GetTileZ(tile) > _opt.snow_line) { /* convert into snow? */ if (GetTileZ(tile) > _opt.snow_line) { /* convert into snow? */
a2 = RAIL_GROUND_ICE_DESERT; new_ground = RAIL_GROUND_ICE_DESERT;
goto modify_me; goto modify_me;
} }
break; break;
case LT_DESERT: case LT_DESERT:
if (GetMapExtraBits(tile) == 1) { /* convert into desert? */ if (GetMapExtraBits(tile) == 1) { /* convert into desert? */
a2 = RAIL_GROUND_ICE_DESERT; new_ground = RAIL_GROUND_ICE_DESERT;
goto modify_me; goto modify_me;
} }
break; break;
@ -1995,20 +1995,20 @@ static void TileLoop_Track(TileIndex tile)
// Don't continue tile loop for depots // Don't continue tile loop for depots
if (_m[tile].m5 & RAIL_TYPE_SPECIAL) return; if (_m[tile].m5 & RAIL_TYPE_SPECIAL) return;
a2 = RAIL_GROUND_GREEN; new_ground = RAIL_GROUND_GREEN;
if (m2 != RAIL_GROUND_BROWN) { /* wait until bottom is green */ if (old_ground != RAIL_GROUND_BROWN) { /* wait until bottom is green */
/* determine direction of fence */ /* determine direction of fence */
rail = _m[tile].m5 & TRACK_BIT_MASK; rail = _m[tile].m5 & TRACK_BIT_MASK;
if (rail == TRACK_BIT_UPPER) { if (rail == TRACK_BIT_UPPER) {
a2 = RAIL_GROUND_FENCE_HORIZ1; new_ground = RAIL_GROUND_FENCE_HORIZ1;
} else if (rail == TRACK_BIT_LOWER) { } else if (rail == TRACK_BIT_LOWER) {
a2 = RAIL_GROUND_FENCE_HORIZ2; new_ground = RAIL_GROUND_FENCE_HORIZ2;
} else if (rail == TRACK_BIT_LEFT) { } else if (rail == TRACK_BIT_LEFT) {
a2 = RAIL_GROUND_FENCE_VERT1; new_ground = RAIL_GROUND_FENCE_VERT1;
} else if (rail == TRACK_BIT_RIGHT) { } else if (rail == TRACK_BIT_RIGHT) {
a2 = RAIL_GROUND_FENCE_VERT2; new_ground = RAIL_GROUND_FENCE_VERT2;
} else { } else {
PlayerID owner = GetTileOwner(tile); PlayerID owner = GetTileOwner(tile);
@ -2016,36 +2016,36 @@ static void TileLoop_Track(TileIndex tile)
if (!IsTileType(tile + TileDiffXY(0, -1), MP_RAILWAY) || if (!IsTileType(tile + TileDiffXY(0, -1), MP_RAILWAY) ||
!IsTileOwner(tile + TileDiffXY(0, -1), owner) || !IsTileOwner(tile + TileDiffXY(0, -1), owner) ||
(_m[tile + TileDiffXY(0, -1)].m5 == TRACK_BIT_UPPER || _m[tile + TileDiffXY(0, -1)].m5 == TRACK_BIT_LEFT)) (_m[tile + TileDiffXY(0, -1)].m5 == TRACK_BIT_UPPER || _m[tile + TileDiffXY(0, -1)].m5 == TRACK_BIT_LEFT))
a2 = RAIL_GROUND_FENCE_NW; new_ground = RAIL_GROUND_FENCE_NW;
} }
if ( (!(rail&(TRACK_BIT_DIAG2|TRACK_BIT_LOWER|TRACK_BIT_RIGHT)) && (rail&TRACK_BIT_DIAG1)) || rail==(TRACK_BIT_UPPER|TRACK_BIT_LEFT)) { if ( (!(rail&(TRACK_BIT_DIAG2|TRACK_BIT_LOWER|TRACK_BIT_RIGHT)) && (rail&TRACK_BIT_DIAG1)) || rail==(TRACK_BIT_UPPER|TRACK_BIT_LEFT)) {
if (!IsTileType(tile + TileDiffXY(0, 1), MP_RAILWAY) || if (!IsTileType(tile + TileDiffXY(0, 1), MP_RAILWAY) ||
!IsTileOwner(tile + TileDiffXY(0, 1), owner) || !IsTileOwner(tile + TileDiffXY(0, 1), owner) ||
(_m[tile + TileDiffXY(0, 1)].m5 == TRACK_BIT_LOWER || _m[tile + TileDiffXY(0, 1)].m5 == TRACK_BIT_RIGHT)) (_m[tile + TileDiffXY(0, 1)].m5 == TRACK_BIT_LOWER || _m[tile + TileDiffXY(0, 1)].m5 == TRACK_BIT_RIGHT))
a2 = (a2 == RAIL_GROUND_FENCE_NW) ? RAIL_GROUND_FENCE_SENW : RAIL_GROUND_FENCE_SE; new_ground = (new_ground == RAIL_GROUND_FENCE_NW) ? RAIL_GROUND_FENCE_SENW : RAIL_GROUND_FENCE_SE;
} }
if ( (!(rail&(TRACK_BIT_DIAG1|TRACK_BIT_UPPER|TRACK_BIT_RIGHT)) && (rail&TRACK_BIT_DIAG2)) || rail==(TRACK_BIT_LOWER|TRACK_BIT_LEFT)) { if ( (!(rail&(TRACK_BIT_DIAG1|TRACK_BIT_UPPER|TRACK_BIT_RIGHT)) && (rail&TRACK_BIT_DIAG2)) || rail==(TRACK_BIT_LOWER|TRACK_BIT_LEFT)) {
if (!IsTileType(tile + TileDiffXY(-1, 0), MP_RAILWAY) || if (!IsTileType(tile + TileDiffXY(-1, 0), MP_RAILWAY) ||
!IsTileOwner(tile + TileDiffXY(-1, 0), owner) || !IsTileOwner(tile + TileDiffXY(-1, 0), owner) ||
(_m[tile + TileDiffXY(-1, 0)].m5 == TRACK_BIT_UPPER || _m[tile + TileDiffXY(-1, 0)].m5 == TRACK_BIT_RIGHT)) (_m[tile + TileDiffXY(-1, 0)].m5 == TRACK_BIT_UPPER || _m[tile + TileDiffXY(-1, 0)].m5 == TRACK_BIT_RIGHT))
a2 = RAIL_GROUND_FENCE_NE; new_ground = RAIL_GROUND_FENCE_NE;
} }
if ( (!(rail&(TRACK_BIT_DIAG1|TRACK_BIT_LOWER|TRACK_BIT_LEFT)) && (rail&TRACK_BIT_DIAG2)) || rail==(TRACK_BIT_UPPER|TRACK_BIT_RIGHT)) { if ( (!(rail&(TRACK_BIT_DIAG1|TRACK_BIT_LOWER|TRACK_BIT_LEFT)) && (rail&TRACK_BIT_DIAG2)) || rail==(TRACK_BIT_UPPER|TRACK_BIT_RIGHT)) {
if (!IsTileType(tile + TileDiffXY(1, 0), MP_RAILWAY) || if (!IsTileType(tile + TileDiffXY(1, 0), MP_RAILWAY) ||
!IsTileOwner(tile + TileDiffXY(1, 0), owner) || !IsTileOwner(tile + TileDiffXY(1, 0), owner) ||
(_m[tile + TileDiffXY(1, 0)].m5 == TRACK_BIT_LOWER || _m[tile + TileDiffXY(1, 0)].m5 == TRACK_BIT_LEFT)) (_m[tile + TileDiffXY(1, 0)].m5 == TRACK_BIT_LOWER || _m[tile + TileDiffXY(1, 0)].m5 == TRACK_BIT_LEFT))
a2 = (a2 == RAIL_GROUND_FENCE_NE) ? RAIL_GROUND_FENCE_NESW : RAIL_GROUND_FENCE_SW; new_ground = (new_ground == RAIL_GROUND_FENCE_NE) ? RAIL_GROUND_FENCE_NESW : RAIL_GROUND_FENCE_SW;
} }
} }
} }
modify_me:; modify_me:;
/* tile changed? */ /* tile changed? */
if (m2 != a2) { if (old_ground != new_ground) {
SB(_m[tile].m2, 0, 4, a2); SB(_m[tile].m2, 0, 4, new_ground);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
} }