Mercurial > hg > openttd
changeset 9990:e2f6744b9a0e draft
(svn r14147) -Codechange: Allow passing 'const Vehicle *' to GetNextUnit() and GetPrevUnit().
author | frosch <frosch@openttd.org> |
---|---|
date | Sat, 23 Aug 2008 22:31:36 +0000 |
parents | 10fd2a3a4a1c |
children | 82c0a9b867a3 |
files | src/train.h |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/train.h +++ b/src/train.h @@ -265,26 +265,26 @@ * @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();