From 04723b240ebc7384954f73590be517ad2a47ce04 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 22 May 2009 14:23:36 +0000 Subject: (svn r16377) -Codechange: unify FOR_ALL_* macros, use separate index variable instead of var->index --- src/vehicle_base.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/vehicle_base.h') diff --git a/src/vehicle_base.h b/src/vehicle_base.h index e602cc4ed..087833cb6 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -642,9 +642,8 @@ struct InvalidVehicle : public Vehicle { const char *GetTypeString() const { return "invalid vehicle"; } }; -#define FOR_ALL_VEHICLES_FROM(v, start) for (v = Vehicle::Get(start); v != NULL; v = (v->index + 1U < Vehicle::GetPoolSize()) ? Vehicle::Get(v->index + 1) : NULL) if (v->IsValid()) -#define FOR_ALL_VEHICLES(v) FOR_ALL_VEHICLES_FROM(v, 0) - +#define FOR_ALL_VEHICLES_FROM(var, start) FOR_ALL_ITEMS_FROM(Vehicle, vehicle_index, var, start) +#define FOR_ALL_VEHICLES(var) FOR_ALL_VEHICLES_FROM(var, 0) /** Generates sequence of free UnitID numbers */ struct FreeUnitIDGenerator { -- cgit v1.2.3-54-g00ecf