Changeset 11185 for code/branches/sagerjFS16/src/orxonox/weaponsystem

Timestamp:

May 12, 2016, 4:03:47 PM (9 years ago)

Author:

sagerj

Message:

fix the charging during reloadtime, the hudchargebar working so far…

Location:

code/branches/sagerjFS16/src/orxonox/weaponsystem

Files:

• WeaponMode.cc (modified) (3 diffs)
• WeaponMode.h (modified) (2 diffs)

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

@@ -64 +64 @@
         this->bParallelReload_ = true;
         this->chargeable_ = false;
+        this->charges_ = 0;
+        this->maxCharges_ = 100;
 
         this->reloadTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&WeaponMode::reloaded, this)));
@@ -172 +174 @@
     bool WeaponMode::push(float* reloadTime)
     {
-        orxout() << "push " << chargeable_ << endl;
+
         if( this->chargeable_)
         {
-            // setting up a timer for knowing how long the weapon was charged 
-            // and passes the value to this->cTime_
-            orxout() << "if " << endl;
+            if(this->charges_ < this->maxCharges_){
+                this->charges_ += 1;
+            }
             return false;
         } else {
-            orxout() << "else " << endl;
             return fire(reloadTime);
         }
@@ -187 +188 @@
     bool WeaponMode::release(float* reloadTime)
     {
-        orxout() << "release " << endl;
         if( this->chargeable_)
         { 
-            orxout() << "if " << endl;
             return fire(reloadTime);
         }else{
-            orxout() << "else " << endl;
             return false;
         }

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

@@ -110 +110 @@
 
             // Fire
+            inline unsigned int getMaxCharges()
+                { return this->maxCharges_;}
+            inline unsigned int getCharges()
+                { return this->charges_;}
+            inline bool isChargeable()
+                { return this->chargeable_;}
             inline void setDamage(float damage)
                 { this->damage_ = damage;}
@@ -170 +176 @@
             unsigned int initialMagazines_;
             unsigned int munitionPerShot_;
+            unsigned int charges_;
+            unsigned int maxCharges_;
 
             float reloadTime_;