Erik Hofman:

Adds some small updates to the sound code (add vector clearing in destructors).

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index c7c7a17d7ce9a799953f9e59922c867fda425a83..527a5f3a497db67a6099e5e223c0b88feb20ffa3 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -45,8 +45,7 @@ FGFX::FGFX ()
 
 FGFX::~FGFX ()
 {
-   for (unsigned int i = 0; i < _sound.size(); i++ )
-      delete _sound[i];
+   _sound.clear();
 }
 
 void

diff --git a/src/Sound/fg_sound.cxx b/src/Sound/fg_sound.cxx
index 9f20d3b6d974c9615c9aba1f0de06418f3fb50f7..9f76ce0aca6d6034fd0ae5aea9698d4bb8224950 100644 (file)
--- a/src/Sound/fg_sound.cxx
+++ b/src/Sound/fg_sound.cxx
@@ -83,6 +83,9 @@ FGSound::~FGSound()
    if (_condition)
       delete _condition;
 
+   _volume.clear();
+   _pitch.clear();
+
    delete _sample;
 }
 

diff --git a/src/Sound/fg_sound.hxx b/src/Sound/fg_sound.hxx
index ce66e13a3dbdd985c3f9c41313e4a0f0ca8b0e80..4d4824bb4ef8ee896aa1a4205a1770a0c5a85875 100644 (file)
--- a/src/Sound/fg_sound.hxx
+++ b/src/Sound/fg_sound.hxx
@@ -33,7 +33,7 @@
 
 #include "soundmgr.hxx"
 
-static const double MAX_TRANSIT_TIME = 0.1;    // 10 ms.
+static const double MAX_TRANSIT_TIME = 0.1;    // 100 ms.
 
 
 /**