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

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

Files:

• ControllableEntity.cc (modified) (1 diff)
• ControllableEntity.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (1 diff)
• pawns/Pawn.h (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

@@ -299 +299 @@
     }
 
-    void ControllableEntity::fire(unsigned int firemode)
+    void ControllableEntity::push(unsigned int firemode)
     {
         if(GameMode::isMaster())
         {
-            this->fired(firemode);
+            this->pushed(firemode);
         }
         else

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h

@@ -96 +96 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            void fire(unsigned int firemode);
+            void push(unsigned int firemode);
             void release(unsigned int firemode);
-            virtual void fired(unsigned int firemode) {}
+            virtual void pushed(unsigned int firemode) {}
             virtual void released(unsigned int firemode) {}
             virtual void reload() {}

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();