diff options
| author | tron <tron@openttd.org> | 2004-12-04 09:26:39 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-12-04 09:26:39 +0000 |
| commit | e56c3cddd8fcf8c852ee7f3c8dc49df9623a94d0 (patch) | |
| tree | c64a0b16a280a9b4e7a310e747e96bca0821aa0e /roadveh_cmd.c | |
| parent | d036559e0ed75f6357e129f2d78808240519fc78 (diff) | |
| download | openttd-e56c3cddd8fcf8c852ee7f3c8dc49df9623a94d0.tar.xz | |
(svn r925) Use sound enums
Also play the correct sound when a toyland road vehicle breaks down
Diffstat (limited to 'roadveh_cmd.c')
| -rw-r--r-- | roadveh_cmd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 647237e07..7c5d8688a 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -503,7 +503,7 @@ static void RoadVehCrash(Vehicle *v) 0); ModifyStationRatingAround(v->tile, v->owner, -160, 22); - SndPlayVehicleFx(16, v); + SndPlayVehicleFx(SND_12_EXPLOSION, v); } static void RoadVehCheckTrainCrash(Vehicle *v) @@ -536,7 +536,8 @@ static void HandleBrokenRoadVeh(Vehicle *v) InvalidateWindow(WC_VEHICLE_VIEW, v->index); InvalidateWindow(WC_VEHICLE_DETAILS, v->index); - SndPlayVehicleFx((_opt.landscape != LT_CANDY) ? 0xD : 0x34, v); + SndPlayVehicleFx((_opt.landscape != LT_CANDY) ? + SND_0F_VEHICLE_BREAKDOWN : SND_35_COMEDY_BREAKDOWN, v); if (!(v->vehstatus & VS_HIDDEN)) { Vehicle *u = CreateEffectVehicleRel(v, 4, 4, 5, EV_BREAKDOWN_SMOKE); @@ -635,8 +636,9 @@ static void HandleRoadVehLoading(Vehicle *v) static void StartRoadVehSound(Vehicle *v) { - int s = RoadVehInfo(v->engine_type)->sfx; - if (s == 23 && (v->tick_counter&3) == 0) s++; + SoundFx s = RoadVehInfo(v->engine_type)->sfx; + if (s == SND_19_BUS_START_PULL_AWAY && (v->tick_counter & 3) == 0) + s = SND_1A_BUS_START_PULL_AWAY_WITH_HORN; SndPlayVehicleFx(s, v); } |