From 6d2b9d2c3a773f415cf65cd071453b9a47d73f7e 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 --- disaster_cmd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'disaster_cmd.c') diff --git a/disaster_cmd.c b/disaster_cmd.c index f31487de1..c6ec0ea49 100644 --- a/disaster_cmd.c +++ b/disaster_cmd.c @@ -166,7 +166,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v) } if ((v->tick_counter&7)==0) { - CreateEffectVehicleRel(v, 0, -17, 2, EV_SMOKE_3); + CreateEffectVehicleRel(v, 0, -17, 2, EV_SMOKE); } } else if (v->current_order.station == 0) { tile = v->tile; /**/ @@ -219,7 +219,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v) SetDisasterVehiclePos(v, x, y, z); if (++v->age == 1) { - CreateEffectVehicleRel(v, 0, 7, 8, EV_CRASHED_SMOKE); + CreateEffectVehicleRel(v, 0, 7, 8, EV_EXPLOSION_LARGE); SndPlayVehicleFx(SND_12_EXPLOSION, v); v->u.disaster.image_override = 0xF42; } else if (v->age == 70) { @@ -232,7 +232,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v) -7 + (r&0xF), -7 + (r>>4&0xF), 5 + (r>>8&0x7), - EV_DEMOLISH); + EV_EXPLOSION_SMALL); } } else if (v->age == 350) { v->current_order.station = 3; @@ -323,7 +323,7 @@ static void DisasterTick_UFO(Vehicle *v) // destroy? if (v->age > 50) { - CreateEffectVehicleRel(v, 0, 7, 8, EV_CRASHED_SMOKE); + CreateEffectVehicleRel(v, 0, 7, 8, EV_EXPLOSION_LARGE); SndPlayVehicleFx(SND_12_EXPLOSION, v); DeleteDisasterVeh(v); } @@ -370,7 +370,7 @@ static void DisasterTick_2(Vehicle *v) x + (r & 0x3F), y + (r >> 6 & 0x3F), (r >> 12 & 0xF), - EV_DEMOLISH); + EV_EXPLOSION_SMALL); if (++v->age >= 55) v->current_order.station = 3; @@ -441,7 +441,7 @@ static void DisasterTick_3(Vehicle *v) x + (r & 0x3F), y + (r >> 6 & 0x3F), (r >> 12 & 0xF), - EV_DEMOLISH); + EV_EXPLOSION_SMALL); if (++v->age >= 55) v->current_order.station = 3; @@ -614,7 +614,7 @@ static void DisasterTick_4b(Vehicle *v) return; v->current_order.station = 1; - CreateEffectVehicleRel(u, 0, 7, 8, EV_CRASHED_SMOKE); + CreateEffectVehicleRel(u, 0, 7, 8, EV_EXPLOSION_LARGE); SndPlayVehicleFx(SND_12_EXPLOSION, u); DeleteDisasterVeh(u); @@ -625,7 +625,7 @@ static void DisasterTick_4b(Vehicle *v) v->x_pos-32+(r&0x3F), v->y_pos-32+(r>>5&0x3F), 0, - EV_DEMOLISH); + EV_EXPLOSION_SMALL); } BEGIN_TILE_LOOP(tile,6,6,v->tile - TILE_XY(3,3)) -- cgit v1.2.3-54-g00ecf