From a81b5187ab33dea4f28aebaa59254f8ae5637218 Mon Sep 17 00:00:00 2001 From: celestar Date: Sat, 22 Jan 2005 18:39:52 +0000 Subject: [PATCH] (svn r1588) -Fix: [ 1105959 ] coded a workaround in the acceleration code so that trains don't think they're on a slope while they drive around in a tunnel --- train_cmd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/train_cmd.c b/train_cmd.c index 1239117883..ec3c72a2f8 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -100,10 +100,12 @@ static int GetRealisticAcceleration(Vehicle *v) uint mass = rvi->weight + ((_cargoc.weights[u->cargo_type] * u->cargo_count) >> 4); if (rvi->power) emass += mass; - if (HASBIT(u->u.rail.flags, VRF_GOINGUP)) { - f += (float)mass * ( -F_GRAV * F_THETA); - } else if (HASBIT(u->u.rail.flags, VRF_GOINGDOWN)) { - f += (float)mass * ( F_GRAV * F_THETA); + if (!IsTileType(u->tile, MP_TUNNELBRIDGE)) { + if (HASBIT(u->u.rail.flags, VRF_GOINGUP)) { + f += (float)mass * ( -F_GRAV * F_THETA); + } else if (HASBIT(u->u.rail.flags, VRF_GOINGDOWN)) { + f += (float)mass * ( F_GRAV * F_THETA); + } } // compute curve penalty..