mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r3579) v->u.rail.first_engine holds an engine type, not a vehicle index, so use INVALID_ENGINE.
This commit is contained in:
parent
2265915e6c
commit
f4215cf6a0
|
@ -86,7 +86,7 @@ void TrainConsistChanged(Vehicle* v)
|
||||||
assert(IsFrontEngine(v) || IsFreeWagon(v));
|
assert(IsFrontEngine(v) || IsFreeWagon(v));
|
||||||
|
|
||||||
rvi_v = RailVehInfo(v->engine_type);
|
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;
|
v->u.rail.cached_total_length = 0;
|
||||||
|
|
||||||
for (u = v; u != NULL; u = u->next) {
|
for (u = v; u != NULL; u = u->next) {
|
||||||
|
@ -97,7 +97,7 @@ void TrainConsistChanged(Vehicle* v)
|
||||||
if (u->first == NULL) u->first = v;
|
if (u->first == NULL) u->first = v;
|
||||||
|
|
||||||
// update the 'first engine'
|
// 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) {
|
if (rvi_u->visual_effect != 0) {
|
||||||
u->u.rail.cached_vis_effect = rvi_u->visual_effect;
|
u->u.rail.cached_vis_effect = rvi_u->visual_effect;
|
||||||
|
|
|
@ -1753,7 +1753,7 @@ static void MaybeReplaceVehicle(Vehicle *v)
|
||||||
temp_cost = ReplaceVehicle(&w, flags);
|
temp_cost = ReplaceVehicle(&w, flags);
|
||||||
|
|
||||||
if (flags & DC_EXEC &&
|
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
|
/* 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 in order to avoid pointing to the old one for trains: these
|
||||||
* pointers should point to the front engine and not the cars
|
* pointers should point to the front engine and not the cars
|
||||||
|
|
Loading…
Reference in New Issue