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

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