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

Timestamp:

Dec 8, 2008, 2:36:47 PM (15 years ago)

Author:

polakma

Message:

made some changes to munition attaching

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) (1 diff)

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

@@ -111 +111 @@
 this->munitionType_ = munitionType; }
 
-    std::string Weapon::getMunitionType()
+    const std::string Weapon::getMunitionType()
     {   return this->munitionType_;  }
 
     Munition * Weapon::getAttachedMunition(std::string munitionType)
     {   
-COUT(0) << "Weapon::getAttachedMunition, parentWeaponSystem_="<< this->parentWeaponSystem_ << std::endl;   
-        this->parentWeaponSystem_->getMunitionType(munitionType);
+COUT(0) << "Weapon::getAttachedMunition, parentWeaponSystem_="<< this->parentWeaponSystem_ << std::endl;
+        this->munition_ = this->parentWeaponSystem_->getMunitionType(munitionType);
 COUT(0) << "Weapon::getAttachedMunition, munition_="<< this->munition_ << std::endl;
 return this->munition_; }