(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, 0 insertions, 5 deletions

diff --git a/functions.h b/functions.h
index 7d729c0ee..b9ed39a32 100644
--- a/functions.h
+++ b/functions.h
@@ -55,11 +55,6 @@ int GetParamInt8();
 int GetParamUint16();
 
 
-/* sound.c */
-void SndPlayTileFx(int sound, TileIndex tile);
-void SndPlayVehicleFx(int sound, Vehicle *v);
-void SndPlayFx(int sound);
-
 /* clear_land.c */
 void DrawHillyLandTile(TileInfo *ti);
 void DrawClearLandTile(TileInfo *ti, byte set);