Changeset 2337 for code/branches/weapon2/src/orxonox

Timestamp:

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

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer for all WeaponPacks and its Weapons

Location:

code/branches/weapon2/src/orxonox/objects

Files:

• weaponSystem/Munition.h (modified) (1 diff)
• weaponSystem/Weapon.cc (modified) (3 diffs)
• weaponSystem/Weapon.h (modified) (2 diffs)
• weaponSystem/WeaponPack.cc (modified) (1 diff)
• weaponSystem/WeaponPack.h (modified) (1 diff)
• weaponSystem/WeaponSet.cc (modified) (1 diff)
• weaponSystem/WeaponSystem.cc (modified) (1 diff)
• weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)
• weaponSystem/weapons/LaserGun.cc (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.h

@@ -59 +59 @@
 
         private:
+
+        protected:
             unsigned int bullets_;
             unsigned int magazines_;

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)

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

@@ -52 +52 @@
             virtual void fire();
             void attachNeededMunition(std::string munitionType);
-            Munition * getAttachedMunition();
+            Munition * getAttachedMunition(std::string munitiontype);
 
             //reloading
@@ -83 +83 @@
 
         private:
+
+        protected:
             bool bulletReadyToShoot_;
             bool magazineReadyToShoot_;

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

@@ -104 +104 @@
         return weapons_[index];
     }
+
+    void WeaponPack::setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
+    {
+        for (int i=0; i < (int) this->weapons_.size(); i++)
+        {
+            this->weapons_[i]->setParentWeaponSystem(weaponSystem);
+        }
+        
+    }
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.h

@@ -60 +60 @@
             Weapon * getWeapon(unsigned int index);
 
+            void setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
+
             inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
                 { parentWeaponSystem_=parentWeaponSystem; }

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

@@ -46 +46 @@
 
         this->parentWeaponSystem_ = 0;
-
+        this->attachedWeaponPack_ = 0;
     }
 

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

@@ -84 +84 @@
         this->munitionSet_[munitionType] = munitionToAdd;
     }
+
+    //returns the Pointer to the munitionType
     Munition * WeaponSystem::getMunitionType(std::string munitionType)
     {

code/branches/weapon2/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

@@ -37 +37 @@
 namespace orxonox
 {
+    CreateFactory(LaserGunMunition);
+
     LaserGunMunition::LaserGunMunition(BaseObject* creator) : Munition(creator)
     {

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -61 +61 @@
         if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {
+COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;    
             //take munition
-            this->getAttachedMunition()->removeBullets(1,this);
+            this->getAttachedMunition(this->munitionType_)->removeBullets(1,this);
             Weapon::bulletTimer();
             this->setBulletReadyToShoot(false);

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -167 +167 @@
     {   
 COUT(0) << "Pawn::setWeaponPack" << std::endl;
-        this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );   }
+        this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );
+        wPack->setParentWeaponSystem(this->weaponSystem_);
+        wPack->setWeaponSystemToAllWeapons(this->weaponSystem_);
+    }
+
     WeaponPack * Pawn::getWeaponPack(unsigned int firemode) const
     {   return this->weaponSystem_->getWeaponPackPointer(firemode);    }