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

Timestamp:

Dec 3, 2008, 6:26:53 PM (15 years ago)

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer for all WeaponPacks and its Weapons

File:

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

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

@@ -44 +44 @@
         this->bulletReadyToShoot_ = true;
         this->magazineReadyToShoot_ = true;
+        this->parentWeaponSystem_ = 0;
+        this->parentWeaponSlot_ = 0;
+        this->munition_ = 0;
     }
 
@@ -90 +93 @@
             {
                 //create new munition with identifier
+COUT(0) << "Weapon::attachNeededMunition, create new Munition of Type " << munitionName << std::endl;
                 this->munitionIdentifier_ = ClassByString(munitionName);
                 this->munition_ = this->munitionIdentifier_.fabricate(this);
@@ -108 +112 @@
     {   return this->munitionType_;  }
 
-    Munition * Weapon::getAttachedMunition()
-    {   return this->munition_; }
+    Munition * Weapon::getAttachedMunition(std::string munitionType)
+    {   
+COUT(0) << "Weapon::getAttachedMunition, parentWeaponSystem_="<< this->parentWeaponSystem_ << std::endl;   
+        this->parentWeaponSystem_->getMunitionType(munitionType);
+COUT(0) << "Weapon::getAttachedMunition, munition_="<< this->munition_ << std::endl;
+return this->munition_; }
 
     void Weapon::setBulletLoadingTime(float loadingTime)