From d641175e3cd1fe5c01c914dde20cbe7388dbeb27 Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 5 Nov 2004 23:12:33 +0000 Subject: (svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk This includes 2 fixes -Fix: [1048596] Monorail and Maglev sounds are swapped (r511) -Add special case to load the jackhammer sound (r478) The rest are cleanups und enumeration to make merging possible/easier --- train_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'train_cmd.c') diff --git a/train_cmd.c b/train_cmd.c index 973878826..7d6f55151 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -9,7 +9,7 @@ #include "news.h" #include "engine.h" #include "player.h" - +#include "sound.h" #define is_firsthead_sprite(spritenum) \ (is_custom_sprite(spritenum) \ @@ -1241,9 +1241,15 @@ static void TrainPlayLeaveStationSound(Vehicle *v) int engtype = v->engine_type; switch (_engines[engtype].railtype) { - case 0: SndPlayVehicleFx(sfx[_rail_vehicle_info[engtype].engclass], v); break; - case 1: SndPlayVehicleFx(0x41, v); break; - case 2: SndPlayVehicleFx(0x47, v); break; + case 0: + SndPlayVehicleFx(sfx[_rail_vehicle_info[engtype].engclass], v); + break; + case 1: + SndPlayVehicleFx(SND_47_MAGLEV_2, v); + break; + case 2: + SndPlayVehicleFx(SND_41_MAGLEV, v); + break; } } -- cgit v1.2.3-54-g00ecf