Changeset 7075 for code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h

Timestamp:

Jun 2, 2010, 12:27:03 AM (14 years ago)

Author:

landauf

Message:

removed some tabs and adjusted formatting in some fps related files

File:

• code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) (3 diffs)

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

@@ -58 +58 @@
             virtual void rotatePitch(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
-            
-            
+
+
             inline void setMeshSource(const std::string& meshname)
                 { this->meshSrc_ = meshname; this->changedMesh(); }
             inline const std::string& getMeshSource() const
                 { return this->meshSrc_; }
-            
-            void boost();                                               //acctually jump
+
+            void boost(); //acctually jump
 
             virtual void fire();
-            
-            bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
-            virtual void addedWeaponPack(WeaponPack* wPack);
-            
+            bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+
+            virtual void addedWeaponPack(WeaponPack* wPack);
+
         protected:
             virtual void setPlayer(PlayerInfo* player);
@@ -84 +84 @@
             float auxilaryThrust_;
             float rotationThrust_;
-            std::string weaponMashName_;
+            std::string weaponMashName_;
             btVector3 localLinearAcceleration_;
             btVector3 localAngularAcceleration_;
@@ -92 +92 @@
             float speed_;
 
-            void changedMesh();
-            Mesh mesh_;
-            std::string meshSrc_;
+            void changedMesh();
+            Mesh mesh_;
+            std::string meshSrc_;
             float yaw_;
             float pitch_;
             float roll_;
             Vector3 localVelocity_;
-            bool isFloor_;
-            bool thisTickBoost_;
-            Quaternion savedOrientation_;
-            Ogre::SceneNode* weaponNode_;
-        };
+            bool isFloor_;
+            bool thisTickBoost_;
+            Quaternion savedOrientation_;
+            Ogre::SceneNode* weaponNode_;
+    };
 }