Changeset 2354 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc

Timestamp:

Dec 8, 2008, 2:36:47 PM (15 years ago)

Author:

polakma

Message:

made some changes to munition attaching

File:

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

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

@@ -59 +59 @@
     }
 
-    void WeaponPack::attachWeapon(Weapon *weapon)
-    {
-        this->weapons_.push_back(weapon);
-    }
-
     void WeaponPack::fire()
     {
@@ -86 +81 @@
     void WeaponPack::setFireMode(unsigned int firemode)
     {
+COUT(0) << "WeaponPack::setFireMode " << std::endl;
         this->firemode_ = firemode;
     }
@@ -97 +93 @@
     {
         weapon->setParentWeaponSystem(this->parentWeaponSystem_);
-COUT(0) << "WeaponPack::addWeapon " << weapon->getMunitionType() << std::endl;
+COUT(0) << "WeaponPack::addWeapon " << weapon << "   munition " << weapon->getMunitionType() << std::endl;
         this->weapons_.push_back(weapon);
     }
 
-    Weapon * WeaponPack::getWeapon(unsigned int index)
+    const Weapon * WeaponPack::getWeapon(unsigned int index)
     {
         return weapons_[index];