# HG changeset patch
# User peter1138 <peter1138@openttd.org>
# Date 2006-02-08 19:06:46
# Node ID 7080146eec37b0fe2efdc3450b665b6cee7cd795
# Parent  e6ff5ed7ac9600d1ee4e55b95d94906a2fbf4dae

(svn r3579) v->u.rail.first_engine holds an engine type, not a vehicle index, so use INVALID_ENGINE.

diff --git a/train_cmd.c b/train_cmd.c
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -86,7 +86,7 @@ void TrainConsistChanged(Vehicle* v)
 	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 @@ void TrainConsistChanged(Vehicle* v)
 		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;
diff --git a/vehicle.c b/vehicle.c
--- a/vehicle.c
+++ b/vehicle.c
@@ -1753,7 +1753,7 @@ static void MaybeReplaceVehicle(Vehicle 
 			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