Changeset 11174 for code/branches/sagerjFS16/src/modules

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

Location:

code/branches/sagerjFS16/src/modules/weapons/weaponmodes

Files:

• Discharger.cc (modified) (2 diffs)
• Discharger.h (modified) (2 diffs)

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc

@@ -54 +54 @@
         this->damage_ = 90.01f;
         this->speed_ = 90.01f;
-        this->charges_ = 0;
+        this->chargeable_ = 0;
 
         this->setMunitionName("LaserMunition");
@@ -65 +65 @@
     void Discharger::fire()
     {
-        charges_ += 1;
-        orxout() << "c = " << charges_ << endl;
-    }
-    
-    void Discharger::release()
-    {
-        orxout() << "release c = " << charges_ << endl;
+        orxout() << "release" << cTime_ << endl;
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h

@@ -48 +48 @@
     @ingroup WeaponsWeaponModes
     */
+
     class _WeaponsExport Discharger : public WeaponMode
     {
@@ -55 +56 @@
 
             virtual void fire() override;
-            virtual void release() override;
 
         private:
-            float speed_; // The speed of the fired projectile.
-            unsigned int charges_; // An indicator of how much you charged up.
+            bool chargeable_;       // An indicator that this weapon type is chargeable.
+            float speed_;           // The speed of the fired projectile.
+            float ctime_;           // time the weapon has charged.
     };
 }