(svn r2104) Simplify implementation of Get{First,Prev}VehicleInChain() and remove a pointless check

This commit is contained in:
tron 2005-03-29 08:37:44 +00:00
parent eb96f89960
commit 3a8665f796
1 changed files with 6 additions and 13 deletions

View File

@ -343,27 +343,20 @@ Vehicle *GetLastVehicleInChain(Vehicle *v)
Vehicle *GetPrevVehicleInChain(const Vehicle *v)
{
const Vehicle *org = v;
Vehicle *u;
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_Train && org == v->next)
return (Vehicle*)v;
}
FOR_ALL_VEHICLES(u) if (u->next == v) return u;
return NULL;
}
Vehicle *GetFirstVehicleInChain(const Vehicle *v)
{
while (true) {
const Vehicle* u = v;
const Vehicle* u;
v = GetPrevVehicleInChain(v);
/* If there is no such vehicle,
'v' == NULL and so 'u' is the first vehicle in chain */
if (v == NULL)
return (Vehicle*)u;
}
while ((u = GetPrevVehicleInChain(v)) != NULL) v = u;
return (Vehicle*)v;
}
int CountVehiclesInChain(Vehicle *v)