diff options
| author | tron <tron@openttd.org> | 2004-11-05 23:12:33 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-11-05 23:12:33 +0000 |
| commit | d641175e3cd1fe5c01c914dde20cbe7388dbeb27 (patch) | |
| tree | 2382dd1e33919458a27b2adb8c4d188b066afe52 /train_cmd.c | |
| parent | 8348068f5faf32c005c87c9dfe939eb6ed1a8a62 (diff) | |
| download | openttd-d641175e3cd1fe5c01c914dde20cbe7388dbeb27.tar.xz | |
(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
Diffstat (limited to 'train_cmd.c')
| -rw-r--r-- | train_cmd.c | 14 |
1 files changed, 10 insertions, 4 deletions
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; } } |