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

Timestamp:

Dec 3, 2008, 4:30:13 PM (16 years ago)

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer bugs

File:

• code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -55 +55 @@
         //WeaponSystem
         weaponSystem_ = new WeaponSystem(this);
+        /*
         WeaponSet * weaponSet1 = new WeaponSet(this,1);
         this->weaponSystem_->attachWeaponSet(weaponSet1);
         //totally bad solution...
         weaponSet1->setParentWeaponSystem(weaponSystem_);
-
+        */
 
         this->registerVariables();
@@ -157 +158 @@
 
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
-    {   this->weaponSystem_->attachWeaponSlot(wSlot);   }
+    {   
+COUT(0) << "Pawn::setWeaponSlot" << std::endl;
+        this->weaponSystem_->attachWeaponSlot(wSlot);   }
     WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
     {   return this->weaponSystem_->getWeaponSlotPointer(index);    }
     
     void Pawn::setWeaponPack(WeaponPack * wPack)
-    {   this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );   }
+    {   
+COUT(0) << "Pawn::setWeaponPack" << std::endl;
+        this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );   }
     WeaponPack * Pawn::getWeaponPack(unsigned int firemode) const
     {   return this->weaponSystem_->getWeaponPackPointer(firemode);    }
     
     void Pawn::setWeaponSet(WeaponSet * wSet)
-    {   this->weaponSystem_->attachWeaponSet(wSet);   }
+    {   
+COUT(0) << "Pawn::setWeaponSet" << std::endl;
+        this->weaponSystem_->attachWeaponSet(wSet);   }
     WeaponSet * Pawn::getWeaponSet(unsigned int index) const
     {   return this->weaponSystem_->getWeaponSetPointer(index);    }