Changeset 2327 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

Timestamp:

Dec 3, 2008, 4:30:13 PM (17 years ago)

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer bugs

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) (3 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -37 +37 @@
 namespace orxonox
 {
+    CreateFactory(Weapon);
+
     Weapon::Weapon(BaseObject* creator) : BaseObject(creator)
     {
@@ -42 +44 @@
         this->bulletReadyToShoot_ = true;
         this->magazineReadyToShoot_ = true;
-        this->setParentWeaponSystem();
     }
 
@@ -95 +96 @@
      *
      */
-    void Weapon::setParentWeaponSystem()
-    {   this->parentWeaponSystem_ = this->parentWeaponSlot_->getParentWeaponSystem(); }
-
     Munition * Weapon::getAttachedMunition()
     {   return this->munition_; }