Changeset 6381 for code/branches

Timestamp:

Dec 19, 2009, 12:07:32 AM (15 years ago)

Author:

rgrieder

Message:

Copy&paste for dummies in Scene.cc (caused fire sound to be very quiet).
And replaced a few sound deletes with destroy().

Location:

code/branches/presentation2/src

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• orxonox/Scene.cc (modified) (1 diff)
• orxonox/items/MultiStateEngine.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -122 +122 @@
                 if ( this->defSndWpnEngine_->isPlaying() )
                     this->defSndWpnEngine_->stop();
-                delete this->defSndWpnEngine_;
+                this->defSndWpnEngine_->destroy();
             }
             if ( this->defSndWpnLaunch_ )
@@ -128 +128 @@
                 if ( this->defSndWpnLaunch_->isPlaying())
                     this->defSndWpnLaunch_->stop();
-                delete this->defSndWpnLaunch_;
+                this->defSndWpnLaunch_->destroy();
             }
         }

code/branches/presentation2/src/orxonox/Scene.cc

@@ -114 +114 @@
         XMLPortParam(Scene, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2f, 0.2f, 0.2f, 1.0f));
         XMLPortParam(Scene, "shadow", setShadow, getShadow, xmlelement, mode).defaultValues(true);
-        XMLPortParam(Scene, "soundReferenceDistance", setSoundReferenceDistance, getSoundReferenceDistance, xmlelement, mode).defaultValues(true);
+        XMLPortParam(Scene, "soundReferenceDistance", setSoundReferenceDistance, getSoundReferenceDistance, xmlelement, mode);
 
         XMLPortParam(Scene, "gravity", setGravity, getGravity, xmlelement, mode);

code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

@@ -88 +88 @@
                         (*it2)->destroy();
                 if (this->defEngineSndNormal_)
-                    delete this->defEngineSndNormal_;
+                    this->defEngineSndNormal_->destroy();
                 if (this->defEngineSndBoost_)
-                    delete this->defEngineSndBoost_;
+                    this->defEngineSndBoost_->destroy();
             }
             if (this->lua_)

code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -84 +84 @@
     WeaponMode::~WeaponMode()
     {
-        if(this->isInitialized())
-        {
-            if( this->defSndWpnFire_ )
-                delete this->defSndWpnFire_;
+        if (this->isInitialized())
+        {
+            if (this->defSndWpnFire_)
+                this->defSndWpnFire_->destroy();
         }
     }