Changeset 10073 for code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h

Timestamp:

May 22, 2014, 2:49:16 PM (11 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (2 diffs)

code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -270 +270 @@
             float stallSpeed_; //!< The forward speed where no more lift is added.
 
+            std::vector<Engine*> engineList_; //!< The list of all Engines mounted on this SpaceShip.
+
         private:
             void registerVariables();
@@ -284 +286 @@
             void backupCamera(); // Save the original position and orientation of the camera.
             void resetCamera(); // Reset the camera to its original position.
-
-            std::vector<Engine*> engineList_; //!< The list of all Engines mounted on this SpaceShip.
 
             Timer timer_;                          //!< Timer for the cooldown duration.