Changeset 8977 for code/branches/presentation2011/src/orxonox/worldentities

Timestamp:

Dec 14, 2011, 2:12:11 PM (13 years ago)

Author:

smerkli

Message:

Merged menue

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/FpsPlayer.h (modified) (1 diff)

code/branches/presentation2011/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -270 +270 @@
     }
 
-    void FpsPlayer::boost() //acctually jump
+    void FpsPlayer::boost(bool bBoost) //acctually jump
     {
         if (this->isFloor_)

code/branches/presentation2011/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -65 +65 @@
                 { return this->meshSrc_; }
 
-            void boost(); //acctually jump
+            void boost(bool bBoost); //acctually jump
 
             virtual void fire();