Changeset 11208 for code/branches/presentationFS16/src/modules

Timestamp:

May 26, 2016, 4:53:34 PM (9 years ago)

Author:

fvultier

Message:

merged discharger, thats the last one

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• src/modules/invader/InvaderEnemyShooter.cc (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (1 diff)
• src/modules/jump/JumpFigure.cc (modified) (1 diff)
• src/modules/jump/JumpFigure.h (modified) (1 diff)
• src/modules/objects/controllers/TurretController.cc (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDChargeBar.cc (copied) (copied from code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc)
• src/modules/overlays/hud/HUDChargeBar.h (copied) (copied from code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h)
• src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseSelecter.h (modified) (1 diff)
• src/modules/weapons/WeaponsPrereqs.h (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• src/modules/weapons/projectiles/RocketOld.cc (modified) (1 diff)
• src/modules/weapons/projectiles/RocketOld.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.cc (copied) (copied from code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc)
• src/modules/weapons/weaponmodes/Discharger.h (copied) (copied from code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h)

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

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

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

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

code/branches/presentationFS16/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/presentationFS16/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/presentationFS16/src/modules/objects/controllers/TurretController.cc

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

code/branches/presentationFS16/src/modules/overlays/hud/CMakeLists.txt

@@ -14 +14 @@
   HUDWeapon.cc
   HUDWeaponSystem.cc
+  HUDChargeBar.cc
   ChatOverlay.cc
   AnnounceMessage.cc

code/branches/presentationFS16/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/presentationFS16/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/presentationFS16/src/modules/weapons/WeaponsPrereqs.h

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

code/branches/presentationFS16/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/presentationFS16/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/presentationFS16/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/presentationFS16/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/presentationFS16/src/modules/weapons/weaponmodes/CMakeLists.txt

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