Reverted bigger parts of tuxdev patch:

[supertux.git] / src / object / ambient_sound.cpp

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 9521070..43ffbde 100644 (file)
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -32,16 +32,28 @@
 #include "log.hpp"
 #include "scripting/squirrel_util.hpp"
 
-AmbientSound::AmbientSound(const lisp::Lisp& lisp) :
-  MovingObject(lisp), sample(""), sound_source(0), latency(0),
-  distance_factor(0), distance_bias(0), maximumvolume(1), currentvolume(0)
+AmbientSound::AmbientSound(const lisp::Lisp& lisp)
 {
-  set_group( COLGROUP_DISABLED );
-  float dimensionX = 0;
-  float dimensionY = 0;
-  lisp.get("width" , dimensionX);
-  lisp.get("height", dimensionY);
-  set_size( dimensionX, dimensionY );
+  name="";
+  position.x = 0;
+  position.y = 0;
+
+  dimension.x = 0;
+  dimension.y = 0;
+
+  distance_factor = 0;
+  distance_bias = 0;
+  maximumvolume = 1;
+  sample = "";
+  currentvolume = 0;
+
+  if (!(lisp.get("x", position.x)&&lisp.get("y", position.y))) {
+    log_warning << "No Position in ambient_sound" << std::endl;
+  }
+
+  lisp.get("name" , name);
+  lisp.get("width" , dimension.x);
+  lisp.get("height", dimension.y);
 
   lisp.get("distance_factor",distance_factor);
   lisp.get("distance_bias"  ,distance_bias  );
@@ -50,8 +62,9 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp) :
 
   // set dimension to zero if smaller than 64, which is default size in flexlay
 
-  if ((get_width() <= 64) && (get_height() <= 64)) {
-    set_size(0, 0);
+  if ((dimension.x <= 64) || (dimension.y <= 64)) {
+    dimension.x = 0;
+    dimension.y = 0;
   }
 
   // square all distances (saves us a sqrt later)
@@ -67,14 +80,23 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp) :
     silence_distance = 1/distance_factor;
 
   lisp.get("silence_distance",silence_distance);
+
+  sound_source = 0; // not playing at the beginning
+  latency=0;
 }
 
-AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file) :
-  sample(file), sound_source(0), latency(0), distance_factor(factor*factor),
-  distance_bias(bias*bias), maximumvolume(vol), currentvolume(0)
+AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file)
 {
-  bbox.p1 = pos;
-  bbox.p2 = pos;
+  position.x=pos.x;
+  position.y=pos.y;
+
+  dimension.x=0;
+  dimension.y=0;
+
+  distance_factor=factor*factor;
+  distance_bias=bias*bias;
+  maximumvolume=vol;
+  sample=file;
 
   // set default silence_distance
 
@@ -82,6 +104,9 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
     silence_distance = 10e99;
   else
     silence_distance = 1/distance_factor;
+
+  sound_source = 0; // not playing at the beginning
+  latency=0;
 }
 
 AmbientSound::~AmbientSound() {
@@ -131,10 +156,10 @@ AmbientSound::update(float deltat)
     py=Sector::current()->player->get_pos().y;
 
     // Relate to which point in the area
-    rx=px<bbox.p1.x?bbox.p1.x:
-      (px<bbox.p2.x?px:bbox.p2.x);
-    ry=py<bbox.p1.y?bbox.p1.y:
-      (py<bbox.p2.y?py:bbox.p2.y);
+    rx=px<position.x?position.x:
+      (px<position.x+dimension.x?px:position.x+dimension.x);
+    ry=py<position.y?position.y:
+      (py<position.y+dimension.y?py:position.y+dimension.y);
 
     // calculate square of distance
     float sqrdistance=(px-rx)*(px-rx)+(py-ry)*(py-ry);
@@ -158,15 +183,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));
     }
   }
@@ -185,15 +210,33 @@ AmbientSound::draw(DrawingContext &)
 void
 AmbientSound::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if(name.empty()) return;
-  expose_object(vm, table_idx, dynamic_cast<Scripting::AmbientSound *>(this), name, false);
+  Scripting::AmbientSound* interface = static_cast<Scripting::AmbientSound*> (this);
+  expose_object(vm, table_idx, interface, name, false);
 }
 
 void
 AmbientSound::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if(name.empty()) return;
   Scripting::unexpose_object(vm, table_idx, name);
 }
 
+void
+AmbientSound::set_pos(float x, float y)
+{
+  position.x = x;
+  position.y = y;
+}
+
+float
+AmbientSound::get_pos_x() const
+{
+  return position.x;
+}
+
+float
+AmbientSound::get_pos_y() const
+{
+  return position.y;
+}
+
 IMPLEMENT_FACTORY(AmbientSound, "ambient_sound");