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

Timestamp:

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

Author:

polakma

Message:

added firemodes and a lot of other things

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) (2 diffs)

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

@@ -33 +33 @@
 
 #include "core/BaseObject.h"
-
+#include "tools/BillboardSet.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -45 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void addMunition();
             virtual void fire();
+            void reloaded();
+            virtual void attachNeededMunition(Munition *PointerToMunition);
+
+            inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)
+                { parentWeaponSlot_=parentWeaponSlot; };
+            inline WeaponSlot * getParentWeaponSlot()
+                { return parentWeaponSlot_; };
+
+            //void setParentWeaponSystem();
 
         private:
-            int loadingTime_;
-            Munition *munition_;
-
+            bool weaponReadyToShoot_;
+            float loadingTime_;
+            Munition *pointerToMunition_;
+            WeaponSlot *parentWeaponSlot_;
+            //WeaponSystem *parentWeaponSystem_;
+            Timer<Weapon> reloadTimer_;