dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r2187) Implement a slightly better workaround than r1588 did. (Joint effort with Celestar)

Browse Source
This commit is contained in:
tron
2005-04-12 09:17:51 +00:00
parent 35e5844be3
commit 2b0c6b6acc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
train_cmd.c
View File

@@ -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);
}
}