Changeset 6265 for code/branches/presentation2

Timestamp:

Dec 7, 2009, 2:23:46 PM (15 years ago)

Author:

scheusso

Message:

fixed weapon sound source problem

Location:

code/branches/presentation2/src/orxonox

Files:

• sound/SoundManager.cc (modified) (1 diff)
• weaponsystem/WeaponMode.cc (modified) (4 diffs)
• weaponsystem/WeaponMode.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -154 +154 @@
     {
         this->processCrossFading(time.getDeltaTime());
+        alcProcessContext(this->context_);
     }
 

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

@@ -39 +39 @@
 #include "WeaponPack.h"
 #include "WeaponSystem.h"
+#include "WeaponSlot.h"
 
 #include "sound/WorldSound.h"
@@ -72 +73 @@
         this->defSndWpnFire_ = new WorldSound(this);
         this->defSndWpnFire_->setLooping(false);
+        this->bSoundAttached_ = false;
     }
 
@@ -104 +106 @@
     {
         (*reloadTime) = this->reloadTime_;
+        if( !this->bSoundAttached_ )
+        {
+            assert(this->getWeapon() && this->getWeapon()->getWeaponSlot());
+            this->getWeapon()->getWeaponSlot()->attach(this->defSndWpnFire_);
+            this->bSoundAttached_ = true;
+        }
 
         if (!this->bReloading_ && this->munition_ && this->munition_->takeMunition(this->munitionPerShot_, this))
@@ -122 +130 @@
             this->reloadTimer_.startTimer();
 
-            assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
-            this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->attach(this->defSndWpnFire_);
             if(!(this->defSndWpnFire_->isPlaying()))
             {

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

@@ -166 +166 @@
 
             WorldSound* defSndWpnFire_;
+            bool        bSoundAttached_;
     };
 }