Mercurial > hg > openttd
changeset 7079:85d64732a312 draft
(svn r10344) -Fix (r10317): confusion between TRACK_n and TRACK_BIT_n stopped NW/SE slopes being picked up, and compare middle of tile against current z, not previous.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Tue, 26 Jun 2007 20:03:17 +0000 |
parents | c4d51d528cd2 |
children | f34aa0966c89 |
files | src/train_cmd.cpp |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2530,14 +2530,14 @@ static byte AfterSetTrainPos(Vehicle *v, bool new_tile) { byte old_z = v->z_pos; - v->z_pos= GetSlopeZ(v->x_pos, v->y_pos); + v->z_pos = GetSlopeZ(v->x_pos, v->y_pos); if (new_tile) { CLRBIT(v->u.rail.flags, VRF_GOINGUP); CLRBIT(v->u.rail.flags, VRF_GOINGDOWN); - if ((v->u.rail.track == TRACK_X || v->u.rail.track == TRACK_Y)) { - /* Any track that isn't TRACK_X or TRACK_Y cannot be sloped. + if (v->u.rail.track == TRACK_BIT_X || v->u.rail.track == TRACK_BIT_Y) { + /* Any track that isn't TRACK_BIT_X or TRACK_BIT_Y cannot be sloped. * To check whether the current tile is sloped, and in which * direction it is sloped, we get the 'z' at the center of * the tile (middle_z) and the edge of the tile (old_z), @@ -2549,7 +2549,7 @@ /* For some reason tunnel tiles are always given as sloped :( * But they are not sloped... */ - if (middle_z != old_z && !IsTunnelTile(TileVirtXY(v->x_pos, v->y_pos))) { + if (middle_z != v->z_pos && !IsTunnelTile(TileVirtXY(v->x_pos, v->y_pos))) { SETBIT(v->u.rail.flags, (middle_z > old_z) ? VRF_GOINGUP : VRF_GOINGDOWN); } }