Changeset 2398 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.cc

Timestamp:

Dec 10, 2008, 9:20:39 PM (15 years ago)

Author:

polakma

Message:

altfire now available

File:

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

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

@@ -66 +66 @@
     void WeaponSlot::fire()
     {
+        if ( this->attachedWeapon_ )
 COUT(0) << "WeaponSlot::fire" << std::endl;
         this->attachedWeapon_->fire();
@@ -79 +80 @@
     {
         this->attachedWeapon_ = weapon;
+        weapon->setAttachedToWeaponSlot(this);
         this->attach(weapon);
 COUT(0) << "WeaponSlot::attachWeapon position=" << this->getWorldPosition() << std::endl;