Changeset 11208 for code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.h

Timestamp:

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

Author:

fvultier

Message:

merged discharger, thats the last one

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/NewHumanController.h (modified) (1 diff)

code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.h

@@ -54 +54 @@
             static void decelerate();
 
-            virtual void doFire(unsigned int firemode) override;
+            virtual void doPush(unsigned int firemode) override;
+            virtual void doRelease(unsigned int firemode) override;
 
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
-
-            static void unfire();
-            virtual void doUnfire();
 
             void centerCursor();