Changeset 11174 for code/branches/sagerjFS16/src/orxonox/worldentities/pawns

Timestamp:

Apr 21, 2016, 4:47:39 PM (9 years ago)

Author:

sagerj

Message:

everything beneath weaponmode changed to push/release - wm modified only need to implement timer/ticker

Location:

code/branches/sagerjFS16/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc

@@ -428 +428 @@
     */
 
-    void Pawn::fired(unsigned int firemode)
-    {
-        if (this->weaponSystem_)
-            this->weaponSystem_->fire(firemode);
+    void Pawn::pushed(unsigned int firemode)
+    {
+        if (this->weaponSystem_)
+            this->weaponSystem_->push(firemode);
     }
 

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h

@@ -157 +157 @@
             virtual void kill();
 
-            virtual void fired(unsigned int firemode) override;
+            virtual void pushed(unsigned int firemode) override;
             virtual void released(unsigned int firemode) override;
             virtual void postSpawn();