X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fambient_sound.cpp;h=8837f91d1da583472ca16786c5dcd851cfde2527;hb=75acd4b141f45e851a492f089aa9ad24a9552409;hp=5d3a7929d85973f99220ac61e0ac3a6ee14652c7;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 5d3a7929d..8837f91d1 100644
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -32,6 +32,7 @@
 #include "audio/sound_source.hpp"
 #include "log.hpp"
 #include "scripting/squirrel_util.hpp"
+#include "object/camera.hpp"
 
 AmbientSound::AmbientSound(const lisp::Lisp& lisp)
 {
@@ -76,13 +77,14 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp)
   // set default silence_distance
 
   if (distance_factor == 0)
-	  silence_distance = std::numeric_limits<float>::max();
+          silence_distance = std::numeric_limits<float>::max();
   else
     silence_distance = 1/distance_factor;
 
   lisp.get("silence_distance",silence_distance);
 
   sound_source = 0; // not playing at the beginning
+  sound_manager->preload(sample);
   latency=0;
 }
 
@@ -102,11 +104,12 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   // set default silence_distance
 
   if (distance_factor == 0)
-	  silence_distance = std::numeric_limits<float>::max();
+          silence_distance = std::numeric_limits<float>::max();
   else
     silence_distance = 1/distance_factor;
 
   sound_source = 0; // not playing at the beginning
+  sound_manager->preload(sample);
   latency=0;
 }
 
@@ -152,9 +155,10 @@ AmbientSound::update(float deltat)
     float px,py;
     float rx,ry;
 
-    // Player position
-    px=Sector::current()->player->get_pos().x;
-    py=Sector::current()->player->get_pos().y;
+    if (!Sector::current() || !Sector::current()->camera) return;
+    // Camera position
+    px=Sector::current()->camera->get_center().x;
+    py=Sector::current()->camera->get_center().y;
 
     // Relate to which point in the area
     rx=px<position.x?position.x:
@@ -184,15 +188,15 @@ AmbientSound::update(float deltat)
       sound_source->set_gain(currentvolume*maximumvolume);
 
       if (sqrdistance>=silence_distance && currentvolume<1e-3)
-	stop_playing();
+        stop_playing();
       latency=0;
     } else {
       if (sqrdistance<silence_distance) {
-	start_playing();
-	latency=0;
+        start_playing();
+        latency=0;
       }
       else // set a reasonable latency
-	latency=(int)(0.001/distance_factor);
+        latency=(int)(0.001/distance_factor);
       //(int)(10*((sqrdistance-silence_distance)/silence_distance));
     }
   }