Changeset 6407 for code/branches/presentation2/src/orxonox/weaponsystem

Timestamp:

Dec 23, 2009, 10:03:08 PM (15 years ago)

Author:

rgrieder

Message:

WeaponSlots should not be synchronised.

Location:

code/branches/presentation2/src/orxonox/weaponsystem

Files:

• WeaponMode.cc (modified) (1 diff)
• WeaponSlot.cc (modified) (1 diff)

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

@@ -114 +114 @@
         if( !this->bSoundAttached_ && GameMode::isMaster() )
         {
-            assert(this->getWeapon() && this->getWeapon()->getWeaponSlot());
-            this->getWeapon()->getWeaponSlot()->attach(this->defSndWpnFire_);
+            assert(this->getWeapon());
+            this->getWeapon()->attach(this->defSndWpnFire_);
             this->bSoundAttached_ = true;
         }

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

@@ -45 +45 @@
         this->weaponSystem_ = 0;
         this->weapon_ = 0;
+
+        this->setSyncMode(0x0);
     }