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 /ship_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 'ship_cmd.c')
| -rw-r--r-- | ship_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ship_cmd.c b/ship_cmd.c index 2877939fb..1cc53d45c 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -9,7 +9,7 @@ #include "engine.h" #include "gui.h" #include "player.h" - +#include "sound.h" static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D}; static const byte _ship_sometracks[4] = {0x19, 0x16, 0x25, 0x2A}; |