(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

1 files changed, 1 insertions, 0 deletions

diff --git a/bridge_gui.c b/bridge_gui.c
index a417166bf..dbb9ef642 100644
--- a/bridge_gui.c
+++ b/bridge_gui.c
@@ -6,6 +6,7 @@
 #include "viewport.h"
 #include "gfx.h"
 #include "command.h"
+#include "sound.h"
 
 static struct BridgeData {
 	int count;