Changeset 2366 for code/branches/weapon2

Timestamp:

Dec 9, 2008, 5:44:34 PM (16 years ago)

Author:

polakma

Message:

fixed some pointer bugs

Location:

code/branches/weapon2/src/orxonox/objects

Files:

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

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

@@ -84 +84 @@
     void Weapon::attachNeededMunition(std::string munitionName)
     {
+COUT(0) << "Weapon::attachNeededMunition, parentWeaponSystem=" << this->parentWeaponSystem_ << std::endl;
         //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_)
         {
+COUT(0) << "Weapon::attachNeededMunition " << munitionName << std::endl;
             Munition* munition = this->parentWeaponSystem_->getMunitionType(munitionName);
             if ( munition )

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

@@ -70 +70 @@
             Timer<Weapon> *getMagazineTimer();
 
-            void setMunitionType(std::string munitionType);
-            const std::string getMunitionType();
+            virtual void setMunitionType(std::string munitionType);
+            virtual const std::string getMunitionType();
 
             inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)

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

@@ -92 +92 @@
     void WeaponPack::addWeapon(Weapon * weapon)
     {
-        weapon->setParentWeaponSystem(this->parentWeaponSystem_);
-COUT(0) << "WeaponPack::addWeapon " << weapon << "   munition " << weapon->getMunitionType() << std::endl;
+COUT(0) << "WeaponPack::addWeapon:" << weapon << "   munition " << weapon->getMunitionType() << std::endl;
         this->weapons_.push_back(weapon);
     }
@@ -102 +101 @@
     }
 
-    void WeaponPack::setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
+    void WeaponPack::setParentWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
     {
         for (int i=0; i < (int) this->weapons_.size(); i++)
@@ -110 +109 @@
 
     }
+
+    void WeaponPack::attachNeededMunitionToAllWeapons()
+    {
+        for (int i=0; i < (int) this->weapons_.size(); i++)
+        {
+            this->weapons_[i]->attachNeededMunition(weapons_[i]->getMunitionType());
+        }
+
+    }
+
 }

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

@@ -59 +59 @@
             const Weapon * getWeapon(unsigned int index);
 
-            void setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
+            //functions needed for creating Pointer to the right objects (-->Pawn.cc)
+            void setParentWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
+            void attachNeededMunitionToAllWeapons();
 
             inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)

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

@@ -56 +56 @@
     {
 COUT(0) << "WeaponSet::attachWeaponPack" << std::endl;
+COUT(0) << "........ parentWeaponSystem_=" << this->parentWeaponSystem_ << std::endl;
+COUT(0) << "........ this->parentWeaponSystem_->getWeaponSlotSize()" << this->parentWeaponSystem_->getWeaponSlotSize() << std::endl;
+COUT(0) << "........ wPack->getSize()" << wPack->getSize() << std::endl;
         if ( this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
         {
+COUT(0) << "WeaponSet::attachWeaponPack after if" << std::endl;
             this->attachedWeaponPack_ = wPack;
             int wPackWeapon = 0;    //WeaponCounter for Attaching
@@ -78 +82 @@
     {
         //fires all WeaponSlots available for this weaponSet attached from the WeaponPack
-COUT(0) << "WeaponSet::fire" << std::endl;
+COUT(0) << "WeaponSet::fire from Pack: " << this->attachedWeaponPack_ << std::endl;
         this->attachedWeaponPack_->fire();
     }

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

@@ -62 +62 @@
     void WeaponSystem::attachWeaponPack(WeaponPack *wPack, unsigned int firemode)
     {
-        wPack->setParentWeaponSystem(this);
         if (firemode < this->weaponSets_.size())
             this->weaponSets_[firemode]->attachWeaponPack(wPack);
@@ -88 +87 @@
     Munition * WeaponSystem::getMunitionType(std::string munitionType)
     {
+COUT(0) << "WeaponSystem::getMunitionType " << munitionType << std::endl;
         std::map<std::string, Munition *>::const_iterator it = this->munitionSet_.find(munitionType);
         if (it != this->munitionSet_.end())

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

@@ -44 +44 @@
     {
         RegisterObject(LaserGun);
-
-        //set weapon properties here
-        //this->setLoadingTime(0.5);
-
-COUT(0) << "LaserGun::LaserGun" << std::endl;
-        this->attachNeededMunition(this->getMunitionType());
     }
 
@@ -58 +52 @@
     void LaserGun::fire()
     {
-COUT(0) << "LaserGun::fire" << std::endl;
+COUT(0) << "LaserGun::fire, this=" << this << std::endl;
         if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {
@@ -81 +75 @@
     }
 
-    void LaserGun::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(LaserGun, XMLPort, xmlelement, mode);
-        XMLPortParam(LaserGun, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
-    }
-
-    void LaserGun::setMunitionType(std::string munitionType)
-    {   
-COUT(0) << "LaserGun::setMunitionType (XMLPort) "<< munitionType << std::endl;
-        this->munitionType_ = munitionType; }
-
-    const std::string LaserGun::getMunitionType()
-    {   return this->munitionType_;  }
-
 }

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

@@ -48 +48 @@
             virtual ~LaserGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
             void fire();
-
-            void setMunitionType(std::string munitionType);
-            const std::string getMunitionType();
 
         private:

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

@@ -167 +167 @@
     {   
 COUT(0) << "Pawn::setWeaponPack" << std::endl;
+        wPack->setParentWeaponSystem(this->weaponSystem_);
+        wPack->setParentWeaponSystemToAllWeapons(this->weaponSystem_);
         this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );
-        wPack->setParentWeaponSystem(this->weaponSystem_);
-        wPack->setWeaponSystemToAllWeapons(this->weaponSystem_);
+        wPack->attachNeededMunitionToAllWeapons();
     }