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

Timestamp:

Apr 14, 2016, 4:02:00 PM (9 years ago)

Author:

sagerj

Message:

today I got pawn'ed

Location:

code/branches/sagerjFS16/src/modules/weapons

Files:

• WeaponsPrereqs.h (modified) (1 diff)
• weaponmodes/CMakeLists.txt (modified) (1 diff)
• weaponmodes/Discharger.cc (modified) (1 diff)
• weaponmodes/Discharger.h (modified) (1 diff)

code/branches/sagerjFS16/src/modules/weapons/WeaponsPrereqs.h

@@ -107 +107 @@
     class SimpleRocketFire;
     class GravityBombFire;
+    class Discharger;
 }
 

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -13 +13 @@
   GravityBombFire.cc
   MineGun.cc
+  Discharger.cc
 )

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

@@ -51 +51 @@
         RegisterObject(Discharger);
 
-        this->reloadTime_ = 0.1f;
-        this->damage_ = 9000.1f*loaded_;
-        this->speed_ = 9000.1f*loaded_;
-
-        this->setMunitionName("dEnergy");
-        this->setFireSound("sounds/Weapon_Discharger.ogg");
-        this->setReloadSound("sounds/Reload_Discharger.ogg", 0.8);
+        this->setMunitionName("LaserMunition");
 
         hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
     }
 
-    /**
-    @brief
-        Fires the weapon. Creates a projectile and fires it.
-    */
     void Discharger::fire()
     {
-        /*BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
-
-        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        projectile->setOrientation(this->getMuzzleOrientation());
-        projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
-
-        projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        projectile->setDamage(this->getDamage());
-        projectile->setShieldDamage(this->getShieldDamage());
-        projectile->setHealthDamage(this->getHealthDamage());*/
-        extern unsigned int beginLoad_ = time;
+        orxout() << "fire dis " << endl;
     }
-    void Discharger::release()
+    
+    bool Discharger::fire(float* reloadTime)
     {
-        extern unsigned int endLoad_ = time;
-        extern unsigned int loaded_ = endLoad_ - beginLoad_;
-
+        orxout() << "fire Discharger " << endl;
+        return false;
+    }
+    bool Discharger::release(float* reloadTime)
+    {
+        orxout() << "release Discharger " << endl;
+        return false;
     }
 }

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

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