Changeset 2145 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.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/WeaponSystem.h (modified) (3 diffs)

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

@@ -39 +39 @@
 namespace orxonox
 {
+    //put here all existing munitionTypes
+    namespace MunitionType
+    {
+        enum Enum
+        { LaserGunMunition };
+    }
+
+    //put here all weapon fire modes.
+    //they have to be added to Pawn and HumanController, too.
+    namespace WeaponMode
+    {
+        enum Enum
+        { fire, altFire, altFire2 };
+    }
+
     class _OrxonoxExport WeaponSystem : public BaseObject
     {
@@ -48 +63 @@
 
             void attachWeaponSet(WeaponSet *wSet);
+            void addMunitionType(Munition *munitionPointer);
             void fire();
-            void fire(unsigned int n);
-            void setActiveWeaponSet(unsigned int n);
+            void fire(WeaponMode::Enum fireMode);
+            //void setActiveWeaponSet(unsigned int n);
             WeaponSet * getWeaponSetPointer(unsigned int n);
 
@@ -61 +77 @@
         private:
             std::vector<WeaponSet *> weaponSets_;
+            std::map<MunitionType::Enum,Munition *> munitionSet_;
             WeaponSet *activeWeaponSet_;
-
             SpaceShip *parentSpaceShip_;
     };