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

Timestamp:

Dec 10, 2008, 5:30:39 PM (17 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:

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

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

@@ -75 +75 @@
     void WeaponPack::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
+        SUPER(WeaponPack, XMLPort, xmlelement, mode);
+
         XMLPortObject(WeaponPack, Weapon, "", addWeapon, getWeapon, xmlelement, mode);
         XMLPortParam(WeaponPack, "firemode", setFireMode, getFireMode, xmlelement, mode);
@@ -115 +117 @@
         {
             this->weapons_[i]->attachNeededMunition(weapons_[i]->getMunitionType());
+            //hack!
+            this->weapons_[i]->setWeapon();
         }