Changeset 645 for code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.h

Timestamp:

Dec 19, 2007, 3:05:56 AM (16 years ago)

Author:

rgrieder

Message:

• weapon system up and running

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.h

@@ -78 +78 @@
     virtual void primaryFire() { };
 
-    virtual void primaryFiring(unsigned int) { };
+    virtual void primaryFiring(float) { };
 
     virtual void secondaryFire() { };
 
-    virtual void secondaryFiring(unsigned int) { };
+    virtual void secondaryFiring(float) { };
 
     inline void registerAllVariables() { }//Model::registerAllVariables(); }
@@ -100 +100 @@
 
     float totalTime_;
-    unsigned long actionStartTime_;
+    float actionStartTime_;
 
     State currentState_;
@@ -107 +107 @@
     Action nextAction_;
     bool actionAdded_;
-    unsigned long timeSinceNextActionAdded_;
-    static const unsigned long nextActionValidityPeriod_ = 500;
+    float timeSinceNextActionAdded_;
+    static float nextActionValidityPeriod_;
 
     // weapon properties
     int leftAmmo_;
-    int primaryFirePower_;
-    int secondaryFirePower_;
-    int primaryFiringRate_;
-    int secondaryFiringRate_;
+    float primaryFirePower_;
+    float secondaryFirePower_;
+    float primaryFiringRate_;
+    float secondaryFiringRate_;
     Ogre::Real primaryBulletSpeed_;
     Ogre::Real secondaryBulletSpeed_;