mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-16 19:19:09 +00:00
Code Issues Activity

(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk

Browse Source 
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
This commit is contained in:
tron
2004-11-05 23:12:33 +00:00
parent 8348068f5f
commit d641175e3c
27 changed files with 200 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
train_cmd.c
View File

@@ -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;
}
}