Changeset 6307 for code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

Timestamp:

Dec 9, 2009, 10:09:27 PM (14 years ago)

Author:

scheusso

Message:

Approach to make sounds synchronisable (not yet working)

File:

• code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) (6 diffs)

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

@@ -71 +71 @@
         this->muzzleOrientation_ = Quaternion::IDENTITY;
 
-        this->defSndWpnFire_ = new WorldSound(this);
-        this->defSndWpnFire_->setLooping(false);
-        this->bSoundAttached_ = false;
+        if( GameMode::isMaster() )
+        {
+            this->defSndWpnFire_ = new WorldSound(this);
+            this->defSndWpnFire_->setLooping(false);
+            this->bSoundAttached_ = false;
+        }
+        else
+            this->defSndWpnFire_ = 0;
     }
 
@@ -80 +85 @@
         if(this->isInitialized())
         {
-            delete this->defSndWpnFire_;
+            if( this->defSndWpnFire_ )
+                delete this->defSndWpnFire_;
         }
     }
@@ -106 +112 @@
     {
         (*reloadTime) = this->reloadTime_;
-        if( !this->bSoundAttached_ )
+        if( !this->bSoundAttached_ && GameMode::isMaster() )
         {
             assert(this->getWeapon() && this->getWeapon()->getWeaponSlot());
@@ -130 +136 @@
             this->reloadTimer_.startTimer();
 
-            if(!(this->defSndWpnFire_->isPlaying()))
+            if( this->defSndWpnFire_ && !(this->defSndWpnFire_->isPlaying()))
             {
                 this->defSndWpnFire_->play();
@@ -222 +228 @@
     void WeaponMode::reloaded()
     {
-        if(this->defSndWpnFire_->isPlaying())
+        if( this->defSndWpnFire_ && this->defSndWpnFire_->isPlaying())
         {
             this->defSndWpnFire_->stop();
@@ -257 +263 @@
     void WeaponMode::setDefaultSound(const std::string& soundPath)
     {
-        this->defSndWpnFire_->setSource(soundPath);
+        if( this->defSndWpnFire_ )
+            this->defSndWpnFire_->setSource(soundPath);
     }
 
     const std::string& WeaponMode::getDefaultSound()
     {
-        return this->defSndWpnFire_->getSource();
+        if( this->defSndWpnFire_ )
+            return this->defSndWpnFire_->getSource();
+        else
+            return std::string();
     }
 }