Changeset 11174 for code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

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

File:

• code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (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