[Orxonox-commit 1689] r6407 - code/branches/presentation2/src/orxonox/weaponsystem

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-23 22:03:08 +0100 (Wed, 23 Dec 2009)
New Revision: 6407

Modified:
   code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc
   code/branches/presentation2/src/orxonox/weaponsystem/WeaponSlot.cc
Log:
WeaponSlots should not be synchronised.

Modified: code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc	2009-12-23 19:45:56 UTC (rev 6406)
+++ code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc	2009-12-23 21:03:08 UTC (rev 6407)
@@ -113,8 +113,8 @@
         (*reloadTime) = this->reloadTime_;
         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;
         }
 

Modified: code/branches/presentation2/src/orxonox/weaponsystem/WeaponSlot.cc
===================================================================
--- code/branches/presentation2/src/orxonox/weaponsystem/WeaponSlot.cc	2009-12-23 19:45:56 UTC (rev 6406)
+++ code/branches/presentation2/src/orxonox/weaponsystem/WeaponSlot.cc	2009-12-23 21:03:08 UTC (rev 6407)
@@ -44,6 +44,8 @@
 
         this->weaponSystem_ = 0;
         this->weapon_ = 0;
+
+        this->setSyncMode(0x0);
     }
 
     WeaponSlot::~WeaponSlot()