use full paths for sound objects

SVN-Revision: 3091

diff --git a/data/levels/world2/level1.stl b/data/levels/world2/level1.stl
index ff87705..327fa26 100644 (file)
--- a/data/levels/world2/level1.stl
+++ b/data/levels/world2/level1.stl
@@ -421,7 +421,7 @@
                        (y 0.0)
                        (width 11197.0)
                        (height 509.0)
-                       (sample "rain")
+                       (sample "sounds/rain.wav")
                        (distance_factor 0.5)
                        (distance_bias 100.0)
                        (volume 1))
@@ -434,7 +434,7 @@
                        (y 2808.0)
                        (width 334.0)
                        (height 259.0)
-                       (sample "waterfall")
+                       (sample "sounds/waterfall.wav")
                        (distance_factor 0.100000001490116)
                        (distance_bias 200.0)
                        (volume 1))
@@ -442,7 +442,7 @@
                        (y 2817.0)
                        (width 127.0)
                        (height 215.0)
-                       (sample "waterfall")
+                       (sample "sounds/waterfall.wav")
                        (distance_factor 0.100000001490116)
                        (distance_bias 200.0)
                        (volume 0))
@@ -455,7 +455,7 @@
                        (y 576.610229492188)
                        (width 1971.0)
                        (height 288.389770507812)
-                       (sample "rain")
+                       (sample "sounds/rain.wav")
                        (distance_factor 0.5)
                        (distance_bias 100.0)
                        (volume 1))
@@ -477,7 +477,7 @@
                        (y 575.55859375)
                        (width 398.47265625)
                        (height 125.03515625)
-                       (sample "rain")
+                       (sample "sounds/rain.wav")
                        (distance_factor 0.5)
                        (distance_bias 100.0)
                        (volume 1))

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 21ad67f..3b8093e 100644 (file)
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -122,10 +122,7 @@ void
 AmbientSound::start_playing()
 {
   try {
-    std::string filename = "sounds/";
-    filename += sample;
-    filename += ".wav";
-    sound_source = sound_manager->create_sound_source(filename);
+    sound_source = sound_manager->create_sound_source(sample);
     if(!sound_source)
       throw std::runtime_error("file not found");