Flesh out the intro scene some more.

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

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 8837f91..730e7a7 100644 (file)
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,27 +12,34 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <math.h>
-#include <stdexcept>
-#include <iostream>
 #include <limits>
+#include <math.h>
 
-#include "ambient_sound.hpp"
-#include "object_factory.hpp"
-#include "lisp/lisp.hpp"
-#include "sector.hpp"
 #include "audio/sound_manager.hpp"
 #include "audio/sound_source.hpp"
-#include "log.hpp"
-#include "scripting/squirrel_util.hpp"
+#include "object/ambient_sound.hpp"
 #include "object/camera.hpp"
-
-AmbientSound::AmbientSound(const lisp::Lisp& lisp)
+#include "scripting/squirrel_util.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
+
+AmbientSound::AmbientSound(const Reader& lisp) :
+  name(),
+  position(),
+  dimension(),
+  sample(),
+  sound_source(),
+  latency(),
+  distance_factor(),
+  distance_bias(),
+  silence_distance(),
+  maximumvolume(),
+  targetvolume(),
+  currentvolume(),
+  volume_ptr()
 {
   name="";
   position.x = 0;
@@ -77,7 +82,7 @@ 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;
 
@@ -88,7 +93,20 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp)
   latency=0;
 }
 
-AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file)
+AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file) :
+  name(),
+  position(),
+  dimension(),
+  sample(),
+  sound_source(),
+  latency(),
+  distance_factor(),
+  distance_bias(),
+  silence_distance(),
+  maximumvolume(),
+  targetvolume(),
+  currentvolume(),
+  volume_ptr()
 {
   position.x=pos.x;
   position.y=pos.y;
@@ -104,7 +122,7 @@ 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;
 
@@ -113,7 +131,8 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   latency=0;
 }
 
-AmbientSound::~AmbientSound() {
+AmbientSound::~AmbientSound()
+{
   stop_playing();
 }
 
@@ -123,7 +142,8 @@ AmbientSound::hit(Player& )
 }
 
 void
-AmbientSound::stop_playing() {
+AmbientSound::stop_playing() 
+{
   delete sound_source;
   sound_source = 0;
 }
@@ -215,14 +235,14 @@ AmbientSound::draw(DrawingContext &)
 void
 AmbientSound::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  Scripting::AmbientSound* interface = static_cast<Scripting::AmbientSound*> (this);
-  expose_object(vm, table_idx, interface, name, false);
+  scripting::AmbientSound* _this = static_cast<scripting::AmbientSound*> (this);
+  expose_object(vm, table_idx, _this, name, false);
 }
 
 void
 AmbientSound::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  Scripting::unexpose_object(vm, table_idx, name);
+  scripting::unexpose_object(vm, table_idx, name);
 }
 
 void
@@ -244,4 +264,4 @@ AmbientSound::get_pos_y() const
   return position.y;
 }
 
-IMPLEMENT_FACTORY(AmbientSound, "ambient_sound");
+/* EOF */