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

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index b4231863f..8837f91d1 100644
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <stdexcept>
 #include <iostream>
+#include <limits>
 
 #include "ambient_sound.hpp"
 #include "object_factory.hpp"
@@ -31,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)
 {
@@ -75,13 +77,14 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp)
   // set default silence_distance
 
   if (distance_factor == 0)
-    silence_distance = 10e99;
+          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;
 }
 
@@ -101,11 +104,12 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   // set default silence_distance
 
   if (distance_factor == 0)
-    silence_distance = 10e99;
+          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;
 }
 
@@ -134,7 +138,7 @@ AmbientSound::start_playing()
 
     sound_source->set_gain(0);
     sound_source->set_looping(true);
-    currentvolume=targetvolume=1e-20;
+    currentvolume=targetvolume=1e-20f;
     sound_source->play();
   } catch(std::exception& e) {
     log_warning << "Couldn't play '" << sample << "': " << e.what() << "" << std::endl;
@@ -151,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:
@@ -175,7 +180,7 @@ AmbientSound::update(float deltat)
 
     // rise/fall half life?
     currentvolume*=pow(rise,deltat*10);
-    currentvolume += 1e-6; // volume is at least 1e-6 (0 would never rise)
+    currentvolume += 1e-6f; // volume is at least 1e-6 (0 would never rise)
 
     if (sound_source != 0) {
 
@@ -183,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));
     }
   }
@@ -221,18 +226,21 @@ AmbientSound::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 }
 
 void
-AmbientSound::set_pos(float x, float y){
+AmbientSound::set_pos(float x, float y)
+{
   position.x = x;
   position.y = y;
 }
 
 float
-AmbientSound::get_pos_x(){;
+AmbientSound::get_pos_x() const
+{
   return position.x;
 }
 
 float
-AmbientSound::get_pos_y(){
+AmbientSound::get_pos_y() const
+{
   return position.y;
 }