From e00785a855c618b54279ad9cc2137ce9f079fa0a Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 12 Apr 2005 09:17:51 +0000 Subject: [PATCH] (svn r2187) Implement a slightly better workaround than r1588 did. (Joint effort with Celestar) --- train_cmd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/train_cmd.c b/train_cmd.c index 55563530a8..7168a29127 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -182,12 +182,10 @@ static int GetTrainAcceleration(Vehicle *v, bool mode) vmass += (_cargoc.weights[u->cargo_type] * u->cargo_count) / 16; mass += vmass; //[t] - if (!IsTileType(u->tile, MP_TUNNELBRIDGE)) { - if (HASBIT(u->u.rail.flags, VRF_GOINGUP)) { - incl += vmass * 60; //3% slope, quite a bit actually - } else if (HASBIT(u->u.rail.flags, VRF_GOINGDOWN)) { - incl -= vmass * 60; - } + if (HASBIT(u->u.rail.flags, VRF_GOINGUP)) { + incl += vmass * 60; //3% slope, quite a bit actually + } else if (HASBIT(u->u.rail.flags, VRF_GOINGDOWN)) { + incl -= vmass * 60; } } @@ -2099,7 +2097,11 @@ static byte AfterSetTrainPos(Vehicle *v, bool new_tile) CLRBIT(v->u.rail.flags, VRF_GOINGDOWN); if (new_z != old_z) { - SETBIT(v->u.rail.flags, (new_z > old_z) ? VRF_GOINGUP : VRF_GOINGDOWN); + TileIndex tile = TILE_FROM_XY(v->x_pos, v->y_pos); + + // XXX workaround, whole UP/DOWN detection needs overhaul + if (!IsTileType(tile, MP_TUNNELBRIDGE) || (_map5[tile] & 0x80) != 0) + SETBIT(v->u.rail.flags, (new_z > old_z) ? VRF_GOINGUP : VRF_GOINGDOWN); } }