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

Timestamp:

Apr 28, 2016, 3:09:26 PM (9 years ago)

Author:

sagerj

Message:

overwritten many fire functions now only need to implement timer/charges

Location:

code/branches/sagerjFS16/src/orxonox/weaponsystem

Files:

• WeaponMode.cc (modified) (3 diffs)
• WeaponMode.h (modified) (1 diff)

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

@@ -63 +63 @@
         this->bAutoReload_ = true;
         this->bParallelReload_ = true;
+        this->chargeable_ = false;
 
         this->reloadTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&WeaponMode::reloaded, this)));
@@ -120 +121 @@
     bool WeaponMode::fire(float* reloadTime)
     {
+        orxout() << "--- " << endl;
         (*reloadTime) = this->reloadTime_;
         // Fireing is only possible if this weapon mode is not reloading and there is enough munition
@@ -170 +172 @@
     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;
+            return false;
         } else {
+            orxout() << "else " << endl;
             return fire(reloadTime);
         }
-        
     }
 
     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

@@ -174 +174 @@
             bool bAutoReload_; // If true, the weapon reloads the magazine automatically.
             bool bParallelReload_; // If true, the weapon reloads in parallel to the magazine reloading.
+            bool chargeable_; // If true, the weapon fires at release instead at push(where he charges up)
 
             float damage_;