(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/rail_cmd.c b/rail_cmd.c
index 3965322f9..18194af21 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -5,6 +5,7 @@
 #include "command.h"
 #include "pathfind.h"
 #include "town.h"
+#include "sound.h"
 
 void ShowTrainDepotWindow(uint tile);