# HG changeset patch # User frosch # Date 2008-08-23 22:31:36 # Node ID 11fe53c71e1b0e3ae034b24fe58ccc4e3a92f522 # Parent 3df1ea4f09828b720841a1bad77fff13c3ce8cd4 (svn r14147) -Codechange: Allow passing 'const Vehicle *' to GetNextUnit() and GetPrevUnit(). diff --git a/src/train.h b/src/train.h --- a/src/train.h +++ b/src/train.h @@ -265,26 +265,26 @@ static inline Vehicle *GetPrevVehicle(co * @param v Vehicle. * @return Next vehicle in the consist. */ -static inline Vehicle *GetNextUnit(Vehicle *v) +static inline Vehicle *GetNextUnit(const Vehicle *v) { assert(v->type == VEH_TRAIN); - v = GetNextVehicle(v); - if (v != NULL && IsRearDualheaded(v)) v = GetNextVehicle(v); + Vehicle *w = GetNextVehicle(v); + if (w != NULL && IsRearDualheaded(w)) w = GetNextVehicle(w); - return v; + return w; } /** Get the previous real (non-articulated part and non rear part of dualheaded engine) vehicle in the consist. * @param v Vehicle. * @return Previous vehicle in the consist. */ -static inline Vehicle *GetPrevUnit(Vehicle *v) +static inline Vehicle *GetPrevUnit(const Vehicle *v) { assert(v->type == VEH_TRAIN); - v = GetPrevVehicle(v); - if (v != NULL && IsRearDualheaded(v)) v = GetPrevVehicle(v); + Vehicle *w = GetPrevVehicle(v); + if (w != NULL && IsRearDualheaded(w)) w = GetPrevVehicle(w); - return v; + return w; } void ConvertOldMultiheadToNew();