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

Timestamp:

Nov 12, 2008, 12:50:18 PM (15 years ago)

Author:

polakma

Message:

made some changes (still doesn't compile)

File:

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

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

@@ -42 +42 @@
         RegisterObject(Weapon);
         this->weaponReadyToShoot_ = true;
-        //this->setParentWeaponSystem();
+        this->setParentWeaponSystem();
+        this->pointerToMunition_ = this->parentWeaponSystem_->getAttachedMunitionPointer;
+        this->attachNeededMunition(this->pointerToMunition_);
 
     }
@@ -66 +68 @@
     }
 
-    void Weapon::attachNeededMunition(Munition *PointerToMunition)
+    void attachNeededMunition(Munition *pointerToMunition)
     {
+        //if munition type already exist attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
+        if ( this->parentWeaponSystem_->munitionSet_[laserGunMunition] )
+            this->pointerToMunition_ = pointerToMunition;
+        else
+        {
+            this->pointerToMunition_ = new LaserGunMunition;
+            this->parentWeaponSystem_->munitionSet_[laserGunMunition] = this->pointerToMunition_;
 
+        }
     }
+
 /*
     void Weapon::setParentWeaponSystem()