Changeset 11174 for code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

Timestamp:

Apr 21, 2016, 4:47:39 PM (9 years ago)

Author:

sagerj

Message:

everything beneath weaponmode changed to push/release - wm modified only need to implement timer/ticker

File:

• code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

@@ -168 +168 @@
     }
 
+    bool WeaponMode::push(float* reloadTime)
+    {
+        if( this->chargeable_)
+        {
+            // setting up a timer for knowing how long the weapon was charged 
+            // and passes the value to this->cTime_
+        } else {
+            return fire(reloadTime);
+        }
+        
+    }
+
     bool WeaponMode::release(float* reloadTime)
     {
-        this->release();
-        return false;
+        if( this->chargeable_)
+        {
+            return fire(reloadTime);
+        }
     }