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

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/modules

Files:

• invader/InvaderEnemyShooter.cc (modified) (1 diff)
• invader/InvaderShip.cc (modified) (1 diff)
• jump/JumpFigure.cc (modified) (1 diff)
• jump/JumpFigure.h (modified) (1 diff)
• objects/controllers/TurretController.cc (modified) (1 diff)
• towerdefense/TowerDefenseSelecter.cc (modified) (1 diff)
• towerdefense/TowerDefenseSelecter.h (modified) (1 diff)
• weapons/projectiles/Rocket.cc (modified) (1 diff)
• weapons/projectiles/Rocket.h (modified) (1 diff)
• weapons/projectiles/RocketOld.cc (modified) (1 diff)
• weapons/projectiles/RocketOld.h (modified) (1 diff)
• weapons/weaponmodes/Discharger.cc (modified) (3 diffs)
• weapons/weaponmodes/Discharger.h (modified) (1 diff)

code/branches/sagerjFS16/src/modules/invader/InvaderEnemyShooter.cc

@@ -71 +71 @@
     void InvaderEnemyShooter::shoot()
     {
-        ControllableEntity::fire(0);
+        ControllableEntity::push(0);
     }
 

code/branches/sagerjFS16/src/modules/invader/InvaderShip.cc

@@ -91 +91 @@
         // shoot!
         if (isFireing)
-            ControllableEntity::fire(0);
+            ControllableEntity::push(0);
 
         // Camera

code/branches/sagerjFS16/src/modules/jump/JumpFigure.cc

@@ -398 +398 @@
     }
 
-    void JumpFigure::fire(unsigned int firemode)
-    {
-
-    }
-
-    void JumpFigure::fired(unsigned int firemode)
+    void JumpFigure::push(unsigned int firemode)
+    {
+
+    }
+
+    void JumpFigure::pushed(unsigned int firemode)
     {
         firePressed_ = true;

code/branches/sagerjFS16/src/modules/jump/JumpFigure.h

@@ -47 +47 @@
             virtual void rotatePitch(const Vector2& value) override;
             virtual void rotateRoll(const Vector2& value) override;
-            void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode) override;
+            void push(unsigned int firemode);
+            virtual void pushed(unsigned int firemode) override;
             virtual void JumpFromPlatform(JumpPlatform* platform);
             virtual void JumpFromSpring(JumpSpring* spring);

code/branches/sagerjFS16/src/modules/objects/controllers/TurretController.cc

@@ -198 +198 @@
             {
 
-                this->getControllableEntity()->fire(0);
+                this->getControllableEntity()->push(0);
             }
         }

code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -146 +146 @@
     }
 
-    void TowerDefenseSelecter::fire(unsigned int firemode)
+    void TowerDefenseSelecter::push(unsigned int firemode)
     {
     }
 
-    void TowerDefenseSelecter::fired(unsigned int firemode)
+    void TowerDefenseSelecter::pushed(unsigned int firemode)
     {
         

code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.h

@@ -47 +47 @@
             virtual void rotatePitch(const Vector2& value) override;
             virtual void rotateRoll(const Vector2& value) override;
-            void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode) override;
+            void push(unsigned int firemode);
+            virtual void pushed(unsigned int firemode) override;
             virtual void boost(bool bBoost) override;
             virtual void setSelectedPosition(TDCoordinate* newPos);

code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.cc

@@ -218 +218 @@
         Destroys the Rocket upon pressing "fire".
     */
-    void Rocket::fired(unsigned int firemode)
+    void Rocket::pushed(unsigned int firemode)
     {
         this->destroyObject();

code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.h

@@ -116 +116 @@
             virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode) override;
+            virtual void pushed(unsigned int firemode) override;
 
             /**

code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.cc

@@ -218 +218 @@
         Destroys the RocketOld upon pressing "fire".
     */
-    void RocketOld::fired(unsigned int firemode)
+    void RocketOld::pushed(unsigned int firemode)
     {
         this->destroyObject();

code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.h

@@ -116 +116 @@
             virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode) override;
+            virtual void pushed(unsigned int firemode) override;
 
         private:

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

@@ -54 +54 @@
         this->damage_ = 90.01f;
         this->speed_ = 90.01f;
-        this->chargeable_ = 0;
+        this->chargeable_ = true;
 
         this->setMunitionName("LaserMunition");
@@ -65 +65 @@
     void Discharger::fire()
     {
-        orxout() << "release" << cTime_ << endl;
+        // orxout() << "release" << cTime_ << endl;
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
@@ -71 +71 @@
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_ * charges_);
+        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
 
         projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage() * charges_);
-        projectile->setShieldDamage(this->getShieldDamage() * charges_);
-        projectile->setHealthDamage(this->getHealthDamage() * charges_);
-        this->charges_ = 0;
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
+        //  this->charges_ = 0;
     }
 }

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

@@ -58 +58 @@
 
         private:
-            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.
-    };
+            //bool chargeable_;     // An indicator that this weapon type is chargeable.
+            int charges_;
+            float speed_;                  // The speed of the fired projectile.
+            float ctime_;                  // time the weapon has charged.
+    }; 
 }