Changeset 194 for code/branches/main_reto_vs05/src/weapon/weapon_manager.h

Timestamp:

Nov 11, 2007, 2:24:50 PM (16 years ago)

Author:

rgrieder

Message:

• added primary and secondary fire in continuous mode
• weapon manager yet very inflexible (one weapon, static values, etc.)

File:

• code/branches/main_reto_vs05/src/weapon/weapon_manager.h (modified) (4 diffs)

code/branches/main_reto_vs05/src/weapon/weapon_manager.h

@@ -44 +44 @@
       NOTHING  = 0,
       RELOAD   = 1,
-      ZOOM_IN  = 2,
-      ZOOM_OUT = 3
+      CHANGE_AMMO  = 2,
+      SPECIAL  = 3
     };
 
@@ -53 +53 @@
       PRIMARY_FIRE = 1,
       SECONDARY_FIRE = 2,
-      RELOADING = 4
+      RELOADING = 3,
+      CHANGING_AMMO = 4,
     };
 
@@ -77 +78 @@
     void primaryFire();
 
+    void primaryFiring(unsigned int);
+
     void secondaryFire();
+
+    void secondaryFiring(unsigned int);
 
   public:
@@ -97 +102 @@
     bool secondaryFireRequest_;
 
+    unsigned long actionStartTime_;
+
     State currentState_;
+    bool secondaryFired_;
 
-    Action *actionList_;
-    int actionListReadIndex_;
-    int actionListWriteIndex_;
+    Action nextAction_;
+    bool actionAdded_;
+    unsigned long timeSinceNextActionAdded_;
+    static const unsigned long nextActionValidityPeriod_ = 500;
 
     static Weapon **weaponList_s;