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

Timestamp:

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

Author:

polakma

Message:

added firemodes and a lot of other things

File:

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

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

@@ -36 +36 @@
 
 #include "Weapon.h"
-
+#include "../worldentities/PositionableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport WeaponSlot : public BaseObject
+    class _OrxonoxExport WeaponSlot : public PositionableEntity
     {
         public:
@@ -48 +48 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void attachWeapon(Weapon *weaponName);
+            void attachWeapon(Weapon *weaponPointer);
             void setAmmoType(bool isUnlimited);
             void fire();
@@ -56 +56 @@
             inline WeaponSet * getParentWeaponSet()
                 { return parentWeaponSet_; }
-