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

Timestamp:

Dec 3, 2008, 5:13:34 PM (15 years ago)

Author:

polakma

Message:

fixed attaching

File:

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

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

@@ -54 +54 @@
     {
         SUPER(Weapon, XMLPort, xmlelement, mode);
+        XMLPortParam(Weapon, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
     }
 
@@ -81 +82 @@
     {
         //if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
-        if ( this->parentWeaponSystem_->getMunitionType(munitionName) )
-            this->munition_ = this->parentWeaponSystem_->getMunitionType(munitionName);
-        else
+        if (this->parentWeaponSystem_)
         {
-            //create new munition with identifier
-            this->munitionIdentifier_ = ClassByString(munitionName);
-            this->munition_ = this->munitionIdentifier_.fabricate(this);
-            this->parentWeaponSystem_->setNewMunition(munitionName, this->munition_);
+            Munition* munition = this->parentWeaponSystem_->getMunitionType(munitionName);
+            if ( munition )
+                this->munition_ = munition;
+            else
+            {
+                //create new munition with identifier
+                this->munitionIdentifier_ = ClassByString(munitionName);
+                this->munition_ = this->munitionIdentifier_.fabricate(this);
+                this->parentWeaponSystem_->setNewMunition(munitionName, this->munition_);
+            }
         }
     }
@@ -96 +101 @@
      *
      */
+
+    void Weapon::setMunitionType(std::string munitionType)
+    {   this->munitionType_ = munitionType; }
+
+    std::string Weapon::getMunitionType()
+    {   return this->munitionType_;  }
+
     Munition * Weapon::getAttachedMunition()
     {   return this->munition_; }