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

Timestamp:

Nov 5, 2008, 7:57:16 PM (16 years ago)

Author:

polakma

Message:

added firemodes and a lot of other things

File:

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

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

@@ -36 +36 @@
 
 
-
 namespace orxonox
 {
-    WeaponSlot::WeaponSlot(BaseObject* creator) : BaseObject(creator)
+    WeaponSlot::WeaponSlot(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(WeaponSlot);
 
         this->unlimitedAmmo_ = false;
-
         this->attachedWeapon_ = 0;
         this->parentWeaponSet_ = 0;
+        this->setObjectMode(0x0);
     }
 
@@ -53 +52 @@
     }
 
-    void WeaponSlot::attachWeapon(Weapon *weaponName)
+    void WeaponSlot::attachWeapon(Weapon *weaponPointer)
     {
+        this->attachedWeapon_ = weaponPointer;
+    }
 
-    }
 
     /*sets the munition type
@@ -69 +69 @@
     void WeaponSlot::fire()
     {
-
+        this->attachedWeapon_->fire();
     }