Mercurial > hg > openttd
changeset 2999:65932847ef9b draft
(svn r3579) v->u.rail.first_engine holds an engine type, not a vehicle index, so use INVALID_ENGINE.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Wed, 08 Feb 2006 19:06:46 +0000 |
parents | 669dab4d9b50 |
children | c40f0a103638 |
files | train_cmd.c vehicle.c |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/train_cmd.c +++ b/train_cmd.c @@ -86,7 +86,7 @@ assert(IsFrontEngine(v) || IsFreeWagon(v)); rvi_v = RailVehInfo(v->engine_type); - first_engine = IsFrontEngine(v) ? v->engine_type : INVALID_VEHICLE; + first_engine = IsFrontEngine(v) ? v->engine_type : INVALID_ENGINE; v->u.rail.cached_total_length = 0; for (u = v; u != NULL; u = u->next) { @@ -97,7 +97,7 @@ if (u->first == NULL) u->first = v; // update the 'first engine' - u->u.rail.first_engine = (v == u) ? INVALID_VEHICLE : first_engine; + u->u.rail.first_engine = (v == u) ? INVALID_ENGINE : first_engine; if (rvi_u->visual_effect != 0) { u->u.rail.cached_vis_effect = rvi_u->visual_effect;
--- a/vehicle.c +++ b/vehicle.c @@ -1753,7 +1753,7 @@ temp_cost = ReplaceVehicle(&w, flags); if (flags & DC_EXEC && - (w->type != VEH_Train || w->u.rail.first_engine == INVALID_VEHICLE)) { + (w->type != VEH_Train || w->u.rail.first_engine == INVALID_ENGINE)) { /* now we bought a new engine and sold the old one. We need to fix the * pointers in order to avoid pointing to the old one for trains: these * pointers should point to the front engine and not the cars