From 6b83a05adabaf5ab47d981b83d8bbf2c7cfc59c3 Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 12 Feb 2005 15:53:32 +0000 Subject: (svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*() -Fix: [1116619] Generate the correct smoke type for diesel trains --- vehicle.h | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'vehicle.h') diff --git a/vehicle.h b/vehicle.h index 15e985889..f13d6877c 100644 --- a/vehicle.h +++ b/vehicle.h @@ -238,23 +238,18 @@ enum TrainSubtype { }; /* Effect vehicle types */ -enum { - EV_INDUSTRYSMOKE = 0, - EV_STEAM_SMOKE = 1, - - EV_SMOKE_1 = 2, - EV_SMOKE_2 = 3, - EV_SMOKE_3 = 4, - - EV_CRASHED_SMOKE = 5, +typedef enum EffectVehicle { + EV_CHIMNEY_SMOKE = 0, + EV_STEAM_SMOKE = 1, + EV_DIESEL_SMOKE = 2, + EV_ELECTRIC_SPARK = 3, + EV_SMOKE = 4, + EV_EXPLOSION_LARGE = 5, EV_BREAKDOWN_SMOKE = 6, - - EV_DEMOLISH = 7, - EV_ROADWORK = 8, - - EV_INDUSTRY_SMOKE = 9, - -}; + EV_EXPLOSION_SMALL = 7, + EV_BULLDOZER = 8, + EV_BUBBLE = 9 +} EffectVehicle; typedef void VehicleTickProc(Vehicle *v); typedef void *VehicleFromPosProc(Vehicle *v, void *data); @@ -295,9 +290,9 @@ int GetAircraftImage(Vehicle *v, byte direction); int GetRoadVehImage(Vehicle *v, byte direction); int GetShipImage(Vehicle *v, byte direction); -Vehicle *CreateEffectVehicle(int x, int y, int z, int type); -Vehicle *CreateEffectVehicleAbove(int x, int y, int z, int type); -Vehicle *CreateEffectVehicleRel(Vehicle *v, int x, int y, int z, int type); +Vehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicle type); +Vehicle *CreateEffectVehicleAbove(int x, int y, int z, EffectVehicle type); +Vehicle *CreateEffectVehicleRel(const Vehicle *v, int x, int y, int z, EffectVehicle type); uint32 VehicleEnterTile(Vehicle *v, uint tile, int x, int y); -- cgit v1.2.3-54-g00ecf