Changeset 2391 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.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/WeaponSlot.cc (modified) (1 diff)

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

@@ -73 +73 @@
     void WeaponSlot::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-
+        SUPER(WeaponSlot, XMLPort, xmlelement, mode);
     }
 
-    void WeaponSlot::attachWeapon(Weapon *weaponPointer)
-    {   this->attachedWeapon_ = weaponPointer;   }
+    void WeaponSlot::attachWeapon(Weapon *weapon)
+    {
+        this->attachedWeapon_ = weapon;
+        this->attach(weapon);
+COUT(0) << "WeaponSlot::attachWeapon position=" << this->getWorldPosition() << std::endl;
+    }
 
     Weapon * WeaponSlot::getAttachedWeapon() const