diff options
| author | peter1138 <peter1138@openttd.org> | 2006-09-27 18:17:01 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-09-27 18:17:01 +0000 |
| commit | 653e7fa54843b4427908b47d2e7da8ee48071a18 (patch) | |
| tree | 89f67db5c4825d95a0c5687363b43db1311ffae7 /roadveh_cmd.c | |
| parent | 3ded010d91a755f3f719d5bfe91cda6d161ef2d0 (diff) | |
| download | openttd-653e7fa54843b4427908b47d2e7da8ee48071a18.tar.xz | |
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
Diffstat (limited to 'roadveh_cmd.c')
| -rw-r--r-- | roadveh_cmd.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c index ef3cf4e10..e8f0d2884 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -26,6 +26,7 @@ #include "newgrf_callbacks.h" #include "newgrf_engine.h" #include "newgrf_text.h" +#include "newgrf_sound.h" #include "yapf/yapf.h" #include "date.h" @@ -621,8 +622,10 @@ static void HandleBrokenRoadVeh(Vehicle *v) InvalidateWindow(WC_VEHICLE_VIEW, v->index); InvalidateWindow(WC_VEHICLE_DETAILS, v->index); - SndPlayVehicleFx((_opt.landscape != LT_CANDY) ? - SND_0F_VEHICLE_BREAKDOWN : SND_35_COMEDY_BREAKDOWN, v); + if (!PlayVehicleSound(v, VSE_BREAKDOWN)) { + 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); @@ -760,10 +763,12 @@ static void HandleRoadVehLoading(Vehicle *v) static void StartRoadVehSound(const Vehicle* v) { - 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); + if (!PlayVehicleSound(v, VSE_START)) { + 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); + } } typedef struct RoadVehFindData { |