(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/road_gui.c b/road_gui.c
index 0488e0308..c7779b878 100644
--- a/road_gui.c
+++ b/road_gui.c
@@ -5,6 +5,7 @@
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"
+#include "sound.h"
 #include "command.h"
 
 static void ShowBusStationPicker();