Changeset 8579 for code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

May 25, 2011, 9:28:29 PM (13 years ago)

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:

• code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) (1 diff)

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

@@ -93 +93 @@
             virtual void reload() {}
 
-            /**
-            @brief Tells the ControllableEntity to either start or stop boosting.
-                   This doesn't mean, that the ControllableEntity will do so, there might be additional restrictions on boosting, but if it can, then it will.
-            @param bBoost If true the ControllableEntity is told to start boosting, if false it is told to stop.
-            */
-            virtual void boost(bool bBoost) {}
-            
+            virtual void boost() {}
             virtual void greet() {}
             virtual void switchCamera();