From 6198a4776b520cb433709aaa3a37cdeccbedbec0 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 29 Nov 2020 20:38:13 +0100 Subject: Change: [NewGRF] Use aircraft property 12 also for helicopters. Due to keeping compatibility we can only do this for NewGRF-defined sound effects. --- src/aircraft_cmd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index eec375d75..447615e3b 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -908,7 +908,11 @@ static bool AircraftController(Aircraft *v) v->cur_speed = 0; if (--u->cur_speed == 32) { if (!PlayVehicleSound(v, VSE_START)) { - SndPlayVehicleFx(SND_18_HELICOPTER, v); + SoundID sfx = AircraftVehInfo(v->engine_type)->sfx; + /* For compatibility with old NewGRF we ignore the sfx property, unless a NewGRF-defined sound is used. + * The baseset has only one helicopter sound, so this only limits using plane or cow sounds. */ + if (sfx < ORIGINAL_SAMPLE_COUNT) sfx = SND_18_HELICOPTER; + SndPlayVehicleFx(sfx, v); } } } else { -- cgit v1.2.3-54-g00ecf