Changeset 11153 for code/branches/sagerjFS16/src/modules/weapons

Timestamp:

Mar 24, 2016, 3:56:35 PM (9 years ago)

Author:

sagerj

Message:

added release functions in various classes: weaponmode, weaponsystem, humancontroller, newhumancontroller, discharger

Location:

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

Files:

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

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

@@ -52 +52 @@
 
         this->reloadTime_ = 0.1f;
-        this->damage_ = 9000.1f;
-        this->speed_ = 9000.1f;
+        this->damage_ = 9000.1f*loaded_;
+        this->speed_ = 9000.1f*loaded_;
 
         this->setMunitionName("dEnergy");
@@ -68 +68 @@
     void Discharger::fire()
     {
-
-    }
-    void Discharger::unfire()
-    {
-        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
+        /*BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
@@ -82 +78 @@
         projectile->setDamage(this->getDamage());
         projectile->setShieldDamage(this->getShieldDamage());
-        projectile->setHealthDamage(this->getHealthDamage());
+        projectile->setHealthDamage(this->getHealthDamage());*/
+        extern unsigned int beginLoad_ = time;
+    }
+    void Discharger::release()
+    {
+        extern unsigned int endLoad_ = time;
+        extern unsigned int loaded_ = endLoad_ - beginLoad_;
+
     }
 }

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

@@ -55 +55 @@
 
             virtual void fire() override;
-            virtual void unfire() override;
+            virtual void release() override;
 
         private:
             float speed_; //!< The speed of the fired projectile.
+            float loaded_; // The time how long the weapon charged
+            float beginLoad_;
+            float endLoad_;
     };
 }